commit 96d0ccd052ef8ef8832207045b4d79e941a95667
author Pankaj Garg <pgarg@codeaurora.org> Thu Jul 30 16:49:47 2015 -0700
committer jrizzoli <joey@cyanogenmoditalia.it> Fri Aug 28 13:15:47 2015 +0200
tree 88a3a3c9194111b0d51f21c5800175596e632e82
parent d488729d0cbaf8111a4fb76948fd28b150e6b0af

Show SSL state on favicon and site settings

Change-Id: I2f74f8caa8b8e4aaee7d78895287bdd7d69f758f

src/com/android/browser/Controller.java

diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index 09dbc3c..8c88c7d 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -86,7 +86,6 @@
 import org.codeaurora.swe.CookieSyncManager;
 import org.codeaurora.swe.Engine;
 import org.codeaurora.swe.HttpAuthHandler;
-import org.codeaurora.swe.SslErrorHandler;
 import org.codeaurora.swe.WebSettings;
 import org.codeaurora.swe.WebView;
 import org.codeaurora.swe.WebBackForwardList;
@@ -195,7 +194,6 @@
     private UrlHandler mUrlHandler;
     private UploadHandler mUploadHandler;
     private IntentHandler mIntentHandler;
-    private PageDialogsHandler mPageDialogsHandler;
     private NetworkStateHandler mNetworkHandler;
 
     private Message mAutoFillSetupMessage;
@@ -271,7 +269,6 @@
 
         mUrlHandler = new UrlHandler(this);
         mIntentHandler = new IntentHandler(mActivity, this);
-        mPageDialogsHandler = new PageDialogsHandler(mActivity, this);
 
         startHandler();
         mBookmarksObserver = new ContentObserver(mHandler) {
@@ -712,9 +709,6 @@
             mActivity.closeOptionsMenu();
             mHandler.sendMessageDelayed(mHandler.obtainMessage(OPEN_MENU), 100);
         }
-        if (mPageDialogsHandler != null) {
-            mPageDialogsHandler.onConfigurationChanged(config);
-        }
         mUi.onConfigurationChanged(config);
     }
 
@@ -1202,9 +1196,7 @@
         if (username != null && password != null) {
             handler.proceed(username, password);
         } else {
-            if (tab.inForeground() /*&& !handler.suppressDialog()*/) {
-                mPageDialogsHandler.showHttpAuthentication(tab, handler, host, realm);
-            } else {
+            if (!tab.inForeground()) {
                 handler.cancel();
             }
         }
@@ -1244,12 +1236,6 @@
         return mUi.getVideoLoadingProgressView();
     }
 
-    @Override
-    public void showSslCertificateOnError(WebView view, SslErrorHandler handler,
-            SslError error) {
-        mPageDialogsHandler.showSSLCertificateOnError(view, handler, error);
-    }
-
     // helper method
 
     /*
@@ -2403,7 +2389,6 @@
 
     @Override
     public void showPageInfo() {
-        mPageDialogsHandler.showPageInfo(mTabControl.getCurrentTab(), false, null);
     }
 
     @Override