Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4115)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ssl/connection_security_android.cc

Issue 1391893003: NOT FOR REVIEW: Aura on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/signin/profile_oauth2_token_service_factory.cc ('k') | chrome/browser/supervised_user/child_accounts/child_account_service.cc » ('j') | content/browser/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/connection_security_android.cc
diff --git a/chrome/browser/ssl/connection_security_android.cc b/chrome/browser/ssl/connection_security_android.cc
index 1d3c056ffede69d6889fd486c8b44e2db090eb96..b6a829ae93db84382aa7d34388a94b5c96094dc2 100644
--- a/chrome/browser/ssl/connection_security_android.cc
+++ b/chrome/browser/ssl/connection_security_android.cc
@@ -18,8 +18,13 @@ bool RegisterConnectionSecurityAndroid(JNIEnv* env) {
jint GetSecurityLevelForWebContents(JNIEnv* env,
jclass jcaller,
jobject jweb_contents) {
+#if !defined(USE_AURA)
content::WebContents* web_contents =
content::WebContents::FromJavaWebContents(jweb_contents);
DCHECK(web_contents);
return connection_security::GetSecurityLevelForWebContents(web_contents);
+#else
+ return 1;
+#endif
+
}
« no previous file with comments | « chrome/browser/signin/profile_oauth2_token_service_factory.cc ('k') | chrome/browser/supervised_user/child_accounts/child_account_service.cc » ('j') | content/browser/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698