| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/website_settings_popup_android.h" | 5 #include "chrome/browser/ui/android/website_settings_popup_android.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "chrome/browser/android/resource_mapper.h" | 10 #include "chrome/browser/android/resource_mapper.h" |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 112 JNIEnv* env, | 112 JNIEnv* env, |
| 113 jobject obj, | 113 jobject obj, |
| 114 jobject java_web_contents) { | 114 jobject java_web_contents) { |
| 115 content::WebContents* web_contents = | 115 content::WebContents* web_contents = |
| 116 content::WebContents::FromJavaWebContents(java_web_contents); | 116 content::WebContents::FromJavaWebContents(java_web_contents); |
| 117 if (!web_contents) | 117 if (!web_contents) |
| 118 return; | 118 return; |
| 119 ChromeSSLHostStateDelegate* delegate = | 119 ChromeSSLHostStateDelegate* delegate = |
| 120 presenter_->chrome_ssl_host_state_delegate(); | 120 presenter_->chrome_ssl_host_state_delegate(); |
| 121 DCHECK(delegate); | 121 DCHECK(delegate); |
| 122 delegate->RevokeUserDecisionsHard(presenter_->site_url().host()); | 122 delegate->RevokeUserAllowExceptionsHard(presenter_->site_url().host()); |
| 123 } | 123 } |
| 124 | 124 |
| 125 void WebsiteSettingsPopupAndroid::SetIdentityInfo( | 125 void WebsiteSettingsPopupAndroid::SetIdentityInfo( |
| 126 const IdentityInfo& identity_info) { | 126 const IdentityInfo& identity_info) { |
| 127 JNIEnv* env = base::android::AttachCurrentThread(); | 127 JNIEnv* env = base::android::AttachCurrentThread(); |
| 128 | 128 |
| 129 { | 129 { |
| 130 int icon_id = ResourceMapper::MapFromChromiumId( | 130 int icon_id = ResourceMapper::MapFromChromiumId( |
| 131 WebsiteSettingsUI::GetIdentityIconID(identity_info.identity_status)); | 131 WebsiteSettingsUI::GetIdentityIconID(identity_info.identity_status)); |
| 132 | 132 |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 void WebsiteSettingsPopupAndroid::SetFirstVisit( | 198 void WebsiteSettingsPopupAndroid::SetFirstVisit( |
| 199 const base::string16& first_visit) { | 199 const base::string16& first_visit) { |
| 200 NOTIMPLEMENTED(); | 200 NOTIMPLEMENTED(); |
| 201 } | 201 } |
| 202 | 202 |
| 203 // static | 203 // static |
| 204 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( | 204 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( |
| 205 JNIEnv* env) { | 205 JNIEnv* env) { |
| 206 return RegisterNativesImpl(env); | 206 return RegisterNativesImpl(env); |
| 207 } | 207 } |
| OLD | NEW |