Backed out changeset 1d41c64ab235 (bug 860326) for robocop crashes.
authorRyan VanderMeulen <ryanvm@gmail.com>
Tue, 16 Apr 2013 15:38:50 -0400
changeset 128954 3a26ebb943ea587b7557df095caa3fd8e085f1af
parent 128953 51644264df6d5b25226a49f8641ed13cb8b0aa27
child 128955 baec6e6659a8e23c3c0f4e768935947a622cef24
push id26596
push userryanvm@gmail.com
push dateTue, 16 Apr 2013 19:38:48 +0000
treeherdermozilla-inbound@3a26ebb943ea [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs860326
milestone23.0a1
backs out1d41c64ab23513bd2bcd0d527b09a28b669e7270
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 1d41c64ab235 (bug 860326) for robocop crashes.
mobile/android/base/BrowserApp.java
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -796,22 +796,17 @@ abstract public class BrowserApp extends
 
         if (mAboutHomeContent != null)
             mAboutHomeContent.refresh();
     }
 
     @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);
     }
 
     public View getActionBarLayout() {
         int actionBarRes;
 
         if (!HardwareUtils.hasMenuButton() || HardwareUtils.isTablet())
            actionBarRes = R.layout.browser_toolbar_menu;