Bug 836689 - The security notification pop-up is still displayed, r=mfinkle
authorMark Capella <markcapella@twcny.rr.com>
Fri, 01 Feb 2013 17:19:47 -0500
changeset 120624 42979cfc8b33c2f6bf5f7ac43a4306c0a935cb90
parent 120623 083e6703ed563a280bf405d5c908964f82543d98
child 120625 c1eda57437ca036d300a72d96dfb2ade5b7da792
push id22334
push usermarkcapella@twcny.rr.com
push dateFri, 01 Feb 2013 22:20:49 +0000
treeherdermozilla-inbound@42979cfc8b33 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmfinkle
bugs836689
milestone21.0a1
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
Bug 836689 - The security notification pop-up is still displayed, r=mfinkle
mobile/android/base/BrowserApp.java
mobile/android/base/WebApp.java.in
--- a/mobile/android/base/BrowserApp.java
+++ b/mobile/android/base/BrowserApp.java
@@ -97,16 +97,19 @@ abstract public class BrowserApp extends
                 // fall through
             case SELECTED:
                 if (Tabs.getInstance().isSelectedTab(tab)) {
                     if ("about:home".equals(tab.getURL()))
                         showAboutHome();
                     else
                         hideAboutHome();
 
+                    // Dismiss any SiteIdentity Popup
+                    SiteIdentityPopup.getInstance().dismiss();
+
                     final TabsPanel.Panel panel = tab.isPrivate()
                                                 ? TabsPanel.Panel.PRIVATE_TABS
                                                 : TabsPanel.Panel.NORMAL_TABS;
                     if (areTabsShown() && mTabsPanel.getCurrentPanel() != panel) {
                         mMainHandler.post(new Runnable() {
                             public void run() {
                                 showTabs(panel);
                             }
--- a/mobile/android/base/WebApp.java.in
+++ b/mobile/android/base/WebApp.java.in
@@ -31,17 +31,16 @@ import java.io.File;
 
 import org.mozilla.gecko.GeckoApp;
 import org.mozilla.gecko.GeckoAppShell;
 import org.mozilla.gecko.GeckoEvent;
 import org.mozilla.gecko.WebAppAllocator;
 import org.mozilla.gecko.Tab;
 import org.mozilla.gecko.Tabs;
 import org.mozilla.gecko.R;
-import org.mozilla.gecko.DoorHangerPopup;
 import org.json.JSONObject;
 
 public class WebApp extends GeckoApp {
     private URL mOrigin;
     private TextView mTitlebarText = null;
     private View mTitlebar = null;
     private static final String LOGTAG = "WebApp";
     private View mSplashscreen = null;