wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Backed out changeset 1d41c64ab235 (bug 860326) for robocop crashes.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2013-04-16 15:38:50 -04:00
parent 24b4056720
commit 8cf1313052
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mobile/android/base/BrowserApp.java
View File

@ -801,12 +801,7 @@ abstract public class BrowserApp extends GeckoApp
@Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
String url = null;
// Don't update the url in the toolbar if the activity was just launched to pick a site.
boolean pickSite = data.getStringExtra(AwesomeBar.TARGET_KEY).equals(AwesomeBar.Target.PICK_SITE.toString());
if (resultCode == Activity.RESULT_OK && !pickSite) {
url = data.getStringExtra(AwesomeBar.URL_KEY);
}
String url = resultCode == Activity.RESULT_OK ? data.getStringExtra(AwesomeBar.URL_KEY) : null;
mBrowserToolbar.fromAwesomeBarSearch(url);
}