| 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 "base/stl_util.h" | 10 #include "base/stl_util.h" |
| 11 #include "chrome/browser/infobars/infobar_service.h" | 11 #include "chrome/browser/infobars/infobar_service.h" |
| 12 #include "chrome/browser/profiles/profile.h" | 12 #include "chrome/browser/profiles/profile.h" |
| 13 #include "chrome/browser/ssl/chrome_security_state_model_client.h" | 13 #include "chrome/browser/ssl/chrome_security_state_model_client.h" |
| 14 #include "chrome/browser/ui/website_settings/website_settings.h" | 14 #include "chrome/browser/ui/website_settings/website_settings.h" |
| 15 #include "chrome/browser/ui/website_settings/website_settings_ui.h" | 15 #include "chrome/browser/ui/website_settings/website_settings_ui.h" |
| 16 #include "components/content_settings/core/common/content_settings.h" | 16 #include "components/content_settings/core/common/content_settings.h" |
| 17 #include "components/content_settings/core/common/content_settings_types.h" | 17 #include "components/content_settings/core/common/content_settings_types.h" |
| 18 #include "content/public/browser/browser_context.h" | 18 #include "content/public/browser/browser_context.h" |
| 19 #include "content/public/browser/cert_store.h" | 19 #include "content/public/browser/cert_store.h" |
| 20 #include "content/public/browser/navigation_controller.h" | 20 #include "content/public/browser/navigation_controller.h" |
| 21 #include "content/public/browser/navigation_entry.h" | 21 #include "content/public/browser/navigation_entry.h" |
| 22 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
| 23 #include "grit/generated_resources.h" | 23 #include "grit/generated_resources.h" |
| 24 #include "jni/WebsiteSettingsPopup_jni.h" | 24 #include "jni/WebsiteSettingsPopup_jni.h" |
| 25 #include "ui/base/l10n/l10n_util.h" | 25 #include "ui/base/l10n/l10n_util.h" |
| 26 | 26 |
| 27 using base::android::ConvertUTF16ToJavaString; | 27 using base::android::ConvertUTF16ToJavaString; |
| 28 using base::android::ConvertUTF8ToJavaString; | 28 using base::android::ConvertUTF8ToJavaString; |
| 29 using base::android::JavaParamRef; |
| 29 | 30 |
| 30 // static | 31 // static |
| 31 static jlong Init(JNIEnv* env, | 32 static jlong Init(JNIEnv* env, |
| 32 const JavaParamRef<jclass>& clazz, | 33 const JavaParamRef<jclass>& clazz, |
| 33 const JavaParamRef<jobject>& obj, | 34 const JavaParamRef<jobject>& obj, |
| 34 const JavaParamRef<jobject>& java_web_contents) { | 35 const JavaParamRef<jobject>& java_web_contents) { |
| 35 content::WebContents* web_contents = | 36 content::WebContents* web_contents = |
| 36 content::WebContents::FromJavaWebContents(java_web_contents); | 37 content::WebContents::FromJavaWebContents(java_web_contents); |
| 37 | 38 |
| 38 return reinterpret_cast<intptr_t>( | 39 return reinterpret_cast<intptr_t>( |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 WebsiteSettingsUI::TabId tab_id) { | 151 WebsiteSettingsUI::TabId tab_id) { |
| 151 // There's no tab UI on Android - only connection info is shown. | 152 // There's no tab UI on Android - only connection info is shown. |
| 152 NOTIMPLEMENTED(); | 153 NOTIMPLEMENTED(); |
| 153 } | 154 } |
| 154 | 155 |
| 155 // static | 156 // static |
| 156 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( | 157 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( |
| 157 JNIEnv* env) { | 158 JNIEnv* env) { |
| 158 return RegisterNativesImpl(env); | 159 return RegisterNativesImpl(env); |
| 159 } | 160 } |
| OLD | NEW |