summaryrefslogtreecommitdiffstats
path: root/content/browser/android
diff options
context:
space:
mode:
authordavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 19:35:07 +0000
committerdavidben@chromium.org <davidben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-06 19:35:07 +0000
commit25af6ecf9c3f9aee202698b81676474065b612ce (patch)
tree61bfd9632fbfe185e26f2857c2033ad168b0b82b /content/browser/android
parent35842a68ac642e67f9e2238f29478084b37fdd93 (diff)
downloadchromium_src-25af6ecf9c3f9aee202698b81676474065b612ce.zip
chromium_src-25af6ecf9c3f9aee202698b81676474065b612ce.tar.gz
chromium_src-25af6ecf9c3f9aee202698b81676474065b612ce.tar.bz2
Remove use of ResourceRequestInfo::GetRequestID from cert enrollment.
That use is both wrong (request IDs are global) and unnecessary since cert enrollment is not a multi-step process. There's some stub code and indirections for prompting to add a cert that's never actually used. Collapse it all to simplify things. Move other random things out of SSLTabHelper which is also no longer necessary. (If anything, this stuff should probably go through the downloads infrastructure to inherit all the user-gesture and throttling checks.) Also move the AddCertificate hook from render_view_id to render_frame_id. BUG=376003 TEST=Visit https://davidben.net/mixed-content-test.html; Click button. Lock icon should change to lock icon with warning. Review URL: https://codereview.chromium.org/302653006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275503 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/android')
-rw-r--r--content/browser/android/web_contents_observer_android.cc8
-rw-r--r--content/browser/android/web_contents_observer_android.h1
2 files changed, 0 insertions, 9 deletions
diff --git a/content/browser/android/web_contents_observer_android.cc b/content/browser/android/web_contents_observer_android.cc
index 19a622a..16ad09f 100644
--- a/content/browser/android/web_contents_observer_android.cc
+++ b/content/browser/android/web_contents_observer_android.cc
@@ -236,14 +236,6 @@ void WebContentsObserverAndroid::NavigationEntryCommitted(
Java_WebContentsObserverAndroid_navigationEntryCommitted(env, obj.obj());
}
-void WebContentsObserverAndroid::DidChangeVisibleSSLState() {
- JNIEnv* env = AttachCurrentThread();
- ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
- if (obj.is_null())
- return;
- Java_WebContentsObserverAndroid_didChangeVisibleSSLState(env, obj.obj());
-}
-
void WebContentsObserverAndroid::DidAttachInterstitialPage() {
JNIEnv* env = AttachCurrentThread();
ScopedJavaLocalRef<jobject> obj(weak_java_observer_.get(env));
diff --git a/content/browser/android/web_contents_observer_android.h b/content/browser/android/web_contents_observer_android.h
index 319436c..9d4421f 100644
--- a/content/browser/android/web_contents_observer_android.h
+++ b/content/browser/android/web_contents_observer_android.h
@@ -77,7 +77,6 @@ class WebContentsObserverAndroid : public WebContentsObserver {
virtual void NavigationEntryCommitted(
const LoadCommittedDetails& load_details) OVERRIDE;
virtual void WebContentsDestroyed() OVERRIDE;
- virtual void DidChangeVisibleSSLState() OVERRIDE;
virtual void DidAttachInterstitialPage() OVERRIDE;
virtual void DidDetachInterstitialPage() OVERRIDE;