OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" | 5 #include "chrome/browser/ui/android/toolbar/toolbar_model_android.h" |
6 | 6 |
7 #include "base/android/jni_string.h" | 7 #include "base/android/jni_string.h" |
8 #include "base/metrics/field_trial.h" | 8 #include "base/metrics/field_trial.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/search/search.h" | 10 #include "chrome/browser/search/search.h" |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 Java_ToolbarModelDelegate_getActiveWebContents(env, jdelegate.obj()); | 58 Java_ToolbarModelDelegate_getActiveWebContents(env, jdelegate.obj()); |
59 return content::WebContents::FromJavaWebContents(jweb_contents.obj()); | 59 return content::WebContents::FromJavaWebContents(jweb_contents.obj()); |
60 } | 60 } |
61 | 61 |
62 // static | 62 // static |
63 bool ToolbarModelAndroid::RegisterToolbarModelAndroid(JNIEnv* env) { | 63 bool ToolbarModelAndroid::RegisterToolbarModelAndroid(JNIEnv* env) { |
64 return RegisterNativesImpl(env); | 64 return RegisterNativesImpl(env); |
65 } | 65 } |
66 | 66 |
67 // static | 67 // static |
68 jlong Init(JNIEnv* env, jobject obj, jobject delegate) { | 68 jlong Init(JNIEnv* env, |
| 69 const JavaParamRef<jobject>& obj, |
| 70 const JavaParamRef<jobject>& delegate) { |
69 ToolbarModelAndroid* toolbar_model = new ToolbarModelAndroid(env, delegate); | 71 ToolbarModelAndroid* toolbar_model = new ToolbarModelAndroid(env, delegate); |
70 return reinterpret_cast<intptr_t>(toolbar_model); | 72 return reinterpret_cast<intptr_t>(toolbar_model); |
71 } | 73 } |
72 | 74 |
73 // Temporary method to allow us to surface a SHA-1 deprecation string on Android | 75 // Temporary method to allow us to surface a SHA-1 deprecation string on Android |
74 // in M42. This duplicates a subset of the logic from | 76 // in M42. This duplicates a subset of the logic from |
75 // ToolbarModelImpl::GetSecurityLevelForWebContents() and | 77 // ToolbarModelImpl::GetSecurityLevelForWebContents() and |
76 // WebsiteSettings::Init(), which should really be refactored. | 78 // WebsiteSettings::Init(), which should really be refactored. |
77 // This is at the wrong layer, and needs to be refactored (along with desktop): | 79 // This is at the wrong layer, and needs to be refactored (along with desktop): |
78 // https://crbug.com/471390 | 80 // https://crbug.com/471390 |
79 | 81 |
80 // static | 82 // static |
81 jboolean IsDeprecatedSHA1Present(JNIEnv* env, | 83 jboolean IsDeprecatedSHA1Present(JNIEnv* env, |
82 jclass jcaller, | 84 const JavaParamRef<jclass>& jcaller, |
83 jobject jweb_contents) { | 85 const JavaParamRef<jobject>& jweb_contents) { |
84 content::WebContents* web_contents = | 86 content::WebContents* web_contents = |
85 content::WebContents::FromJavaWebContents(jweb_contents); | 87 content::WebContents::FromJavaWebContents(jweb_contents); |
86 DCHECK(web_contents); | 88 DCHECK(web_contents); |
87 | 89 |
88 content::NavigationEntry* entry = | 90 content::NavigationEntry* entry = |
89 web_contents->GetController().GetVisibleEntry(); | 91 web_contents->GetController().GetVisibleEntry(); |
90 if (!entry) | 92 if (!entry) |
91 return false; | 93 return false; |
92 | 94 |
93 const content::SSLStatus& ssl = entry->GetSSL(); | 95 const content::SSLStatus& ssl = entry->GetSSL(); |
94 if (ssl.security_style == content::SECURITY_STYLE_AUTHENTICATED) { | 96 if (ssl.security_style == content::SECURITY_STYLE_AUTHENTICATED) { |
95 scoped_refptr<net::X509Certificate> cert; | 97 scoped_refptr<net::X509Certificate> cert; |
96 // NOTE: This constant needs to be kept in sync with | 98 // NOTE: This constant needs to be kept in sync with |
97 // ToolbarModelImpl::GetSecurityLevelForWebContents(). | 99 // ToolbarModelImpl::GetSecurityLevelForWebContents(). |
98 static const int64_t kJanuary2016 = INT64_C(13096080000000000); | 100 static const int64_t kJanuary2016 = INT64_C(13096080000000000); |
99 if (content::CertStore::GetInstance()->RetrieveCert(ssl.cert_id, &cert) && | 101 if (content::CertStore::GetInstance()->RetrieveCert(ssl.cert_id, &cert) && |
100 (ssl.cert_status & net::CERT_STATUS_SHA1_SIGNATURE_PRESENT) && | 102 (ssl.cert_status & net::CERT_STATUS_SHA1_SIGNATURE_PRESENT) && |
101 cert->valid_expiry() > base::Time::FromInternalValue(kJanuary2016)) { | 103 cert->valid_expiry() > base::Time::FromInternalValue(kJanuary2016)) { |
102 return true; | 104 return true; |
103 } | 105 } |
104 } | 106 } |
105 return false; | 107 return false; |
106 } | 108 } |
OLD | NEW |