mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 877870 - Factor out code to open url and cancel editing mode (r=bnicholson)
This commit is contained in:
parent
eb24a36064
commit
b14f95bcbd
@ -1117,6 +1117,18 @@ abstract public class BrowserApp extends GeckoApp
|
||||
outState.putBoolean(STATE_DYNAMIC_TOOLBAR_ENABLED, mDynamicToolbarEnabled);
|
||||
}
|
||||
|
||||
private void openUrl(String url) {
|
||||
mBrowserToolbar.setProgressVisibility(true);
|
||||
|
||||
int flags = Tabs.LOADURL_NONE;
|
||||
if (mBrowserToolbar.getEditingTarget() == EditingTarget.NEW_TAB) {
|
||||
flags |= Tabs.LOADURL_NEW_TAB;
|
||||
}
|
||||
|
||||
Tabs.getInstance().loadUrl(url, flags);
|
||||
mBrowserToolbar.cancelEdit();
|
||||
}
|
||||
|
||||
/* Favicon methods */
|
||||
private void loadFavicon(final Tab tab) {
|
||||
maybeCancelFaviconLoad(tab);
|
||||
@ -1764,15 +1776,7 @@ abstract public class BrowserApp extends GeckoApp
|
||||
|
||||
@Override
|
||||
public void onAboutHomeUriLoad(String url) {
|
||||
mBrowserToolbar.setProgressVisibility(true);
|
||||
|
||||
int flags = Tabs.LOADURL_NONE;
|
||||
if (mBrowserToolbar.getEditingTarget() == EditingTarget.NEW_TAB) {
|
||||
flags |= Tabs.LOADURL_NEW_TAB;
|
||||
}
|
||||
|
||||
Tabs.getInstance().loadUrl(url, flags);
|
||||
mBrowserToolbar.cancelEdit();
|
||||
openUrl(url);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Loading…
Reference in New Issue
Block a user