Bug 982022 - Don't override getResponse method in BrowserApp. r=rnewman, a=sledru
authorWes Johnston <wjohnston@mozilla.com>
Thu, 13 Mar 2014 10:32:14 -0700
changeset 183321 0b8e50425d634025e81ed875f5a916453a704251
parent 183320 db6020bbfbfeb87041217c060b71a1696cac9740
child 183322 1b0404fd3518277a43deb067aeda6f694c417045
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrnewman, sledru
bugs982022
milestone29.0a2
Bug 982022 - Don't override getResponse method in BrowserApp. r=rnewman, a=sledru
mobile/android/base/BrowserApp.java
mobile/android/base/GeckoApp.java
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -1264,25 +1264,16 @@ abstract public class BrowserApp extends
             } else {
                 super.handleMessage(event, message);
             }
         } catch (Exception e) {
             Log.e(LOGTAG, "Exception handling message \"" + event + "\":", e);
         }
     }
 
-    private String mCurrentResponse;
-
-    @Override
-    public String getResponse(JSONObject origMessage) {
-        String res = mCurrentResponse;
-        mCurrentResponse = "";
-        return res;
-    }
-
     @Override
     public void addTab() {
         // Always load about:home when opening a new tab.
         Tabs.getInstance().loadUrl(AboutPages.HOME, Tabs.LOADURL_NEW_TAB);
     }
 
     @Override
     public void addPrivateTab() {
--- a/mobile/android/base/GeckoApp.java
+++ b/mobile/android/base/GeckoApp.java
@@ -181,17 +181,17 @@ public abstract class GeckoApp
     private OrientationEventListener mCameraOrientationEventListener;
     public List<GeckoAppShell.AppStateListener> mAppStateListeners;
     private static GeckoApp sAppContext;
     protected MenuPanel mMenuPanel;
     protected Menu mMenu;
     protected GeckoProfile mProfile;
     public static int mOrientation;
     protected boolean mIsRestoringActivity;
-    private String mCurrentResponse = "";
+    protected String mCurrentResponse = "";
 
     private ContactService mContactService;
     private PromptService mPromptService;
     private TextSelection mTextSelection;
 
     protected DoorHangerPopup mDoorHangerPopup;
     protected FormAssistPopup mFormAssistPopup;
     protected ButtonToast mToast;