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/page_info/website_settings_popup_android.h" | 5 #include "chrome/browser/ui/android/page_info/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/android/search_geolocation/search_geolocation_service.h
" | 11 #include "chrome/browser/android/search_geolocation/search_geolocation_service.h
" |
12 #include "chrome/browser/infobars/infobar_service.h" | 12 #include "chrome/browser/infobars/infobar_service.h" |
13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/ssl/security_state_tab_helper.h" | 14 #include "chrome/browser/ssl/security_state_tab_helper.h" |
15 #include "chrome/browser/ui/page_info/website_settings.h" | 15 #include "chrome/browser/ui/page_info/page_info.h" |
16 #include "chrome/browser/ui/page_info/website_settings_ui.h" | 16 #include "chrome/browser/ui/page_info/page_info_ui.h" |
17 #include "components/content_settings/core/common/content_settings.h" | 17 #include "components/content_settings/core/common/content_settings.h" |
18 #include "components/content_settings/core/common/content_settings_types.h" | 18 #include "components/content_settings/core/common/content_settings_types.h" |
19 #include "components/security_state/core/security_state.h" | 19 #include "components/security_state/core/security_state.h" |
20 #include "content/public/browser/browser_context.h" | 20 #include "content/public/browser/browser_context.h" |
21 #include "content/public/browser/navigation_controller.h" | 21 #include "content/public/browser/navigation_controller.h" |
22 #include "content/public/browser/navigation_entry.h" | 22 #include "content/public/browser/navigation_entry.h" |
23 #include "content/public/browser/web_contents.h" | 23 #include "content/public/browser/web_contents.h" |
24 #include "jni/WebsiteSettingsPopup_jni.h" | 24 #include "jni/WebsiteSettingsPopup_jni.h" |
25 #include "url/origin.h" | 25 #include "url/origin.h" |
26 | 26 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 SecurityStateTabHelper* helper = | 58 SecurityStateTabHelper* helper = |
59 SecurityStateTabHelper::FromWebContents(web_contents); | 59 SecurityStateTabHelper::FromWebContents(web_contents); |
60 DCHECK(helper); | 60 DCHECK(helper); |
61 security_state::SecurityInfo security_info; | 61 security_state::SecurityInfo security_info; |
62 helper->GetSecurityInfo(&security_info); | 62 helper->GetSecurityInfo(&security_info); |
63 | 63 |
64 search_geolocation_service_ = | 64 search_geolocation_service_ = |
65 SearchGeolocationService::Factory::GetForBrowserContext( | 65 SearchGeolocationService::Factory::GetForBrowserContext( |
66 web_contents->GetBrowserContext()); | 66 web_contents->GetBrowserContext()); |
67 | 67 |
68 presenter_.reset(new WebsiteSettings( | 68 presenter_.reset(new PageInfo( |
69 this, Profile::FromBrowserContext(web_contents->GetBrowserContext()), | 69 this, Profile::FromBrowserContext(web_contents->GetBrowserContext()), |
70 TabSpecificContentSettings::FromWebContents(web_contents), web_contents, | 70 TabSpecificContentSettings::FromWebContents(web_contents), web_contents, |
71 nav_entry->GetURL(), security_info)); | 71 nav_entry->GetURL(), security_info)); |
72 } | 72 } |
73 | 73 |
74 WebsiteSettingsPopupAndroid::~WebsiteSettingsPopupAndroid() {} | 74 WebsiteSettingsPopupAndroid::~WebsiteSettingsPopupAndroid() {} |
75 | 75 |
76 void WebsiteSettingsPopupAndroid::Destroy(JNIEnv* env, | 76 void WebsiteSettingsPopupAndroid::Destroy(JNIEnv* env, |
77 const JavaParamRef<jobject>& obj) { | 77 const JavaParamRef<jobject>& obj) { |
78 delete this; | 78 delete this; |
79 } | 79 } |
80 | 80 |
81 void WebsiteSettingsPopupAndroid::RecordWebsiteSettingsAction( | 81 void WebsiteSettingsPopupAndroid::RecordPageInfoAction( |
82 JNIEnv* env, | 82 JNIEnv* env, |
83 const JavaParamRef<jobject>& obj, | 83 const JavaParamRef<jobject>& obj, |
84 jint action) { | 84 jint action) { |
85 presenter_->RecordWebsiteSettingsAction( | 85 presenter_->RecordPageInfoAction( |
86 static_cast<WebsiteSettings::WebsiteSettingsAction>(action)); | 86 static_cast<PageInfo::PageInfoAction>(action)); |
87 } | 87 } |
88 | 88 |
89 void WebsiteSettingsPopupAndroid::SetIdentityInfo( | 89 void WebsiteSettingsPopupAndroid::SetIdentityInfo( |
90 const IdentityInfo& identity_info) { | 90 const IdentityInfo& identity_info) { |
91 JNIEnv* env = base::android::AttachCurrentThread(); | 91 JNIEnv* env = base::android::AttachCurrentThread(); |
92 std::unique_ptr<WebsiteSettingsUI::SecurityDescription> security_description = | 92 std::unique_ptr<PageInfoUI::SecurityDescription> security_description = |
93 identity_info.GetSecurityDescription(); | 93 identity_info.GetSecurityDescription(); |
94 | 94 |
95 Java_WebsiteSettingsPopup_setSecurityDescription( | 95 Java_WebsiteSettingsPopup_setSecurityDescription( |
96 env, popup_jobject_, | 96 env, popup_jobject_, |
97 ConvertUTF16ToJavaString(env, security_description->summary), | 97 ConvertUTF16ToJavaString(env, security_description->summary), |
98 ConvertUTF16ToJavaString(env, security_description->details)); | 98 ConvertUTF16ToJavaString(env, security_description->details)); |
99 } | 99 } |
100 | 100 |
101 void WebsiteSettingsPopupAndroid::SetCookieInfo( | 101 void WebsiteSettingsPopupAndroid::SetCookieInfo( |
102 const CookieInfoList& cookie_info_list) { | 102 const CookieInfoList& cookie_info_list) { |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
137 ? CONTENT_SETTING_ALLOW | 137 ? CONTENT_SETTING_ALLOW |
138 : CONTENT_SETTING_BLOCK; | 138 : CONTENT_SETTING_BLOCK; |
139 } | 139 } |
140 } | 140 } |
141 } | 141 } |
142 } | 142 } |
143 | 143 |
144 for (const auto& permission : permissions_to_display) { | 144 for (const auto& permission : permissions_to_display) { |
145 if (base::ContainsKey(user_specified_settings_to_display, permission)) { | 145 if (base::ContainsKey(user_specified_settings_to_display, permission)) { |
146 base::string16 setting_title = | 146 base::string16 setting_title = |
147 WebsiteSettingsUI::PermissionTypeToUIString(permission); | 147 PageInfoUI::PermissionTypeToUIString(permission); |
148 | 148 |
149 Java_WebsiteSettingsPopup_addPermissionSection( | 149 Java_WebsiteSettingsPopup_addPermissionSection( |
150 env, popup_jobject_, ConvertUTF16ToJavaString(env, setting_title), | 150 env, popup_jobject_, ConvertUTF16ToJavaString(env, setting_title), |
151 static_cast<jint>(permission), | 151 static_cast<jint>(permission), |
152 static_cast<jint>(user_specified_settings_to_display[permission])); | 152 static_cast<jint>(user_specified_settings_to_display[permission])); |
153 } | 153 } |
154 } | 154 } |
155 | 155 |
156 for (const auto& chosen_object : chosen_object_info_list) { | 156 for (const auto& chosen_object : chosen_object_info_list) { |
157 base::string16 object_title = | 157 base::string16 object_title = |
158 WebsiteSettingsUI::ChosenObjectToUIString(*chosen_object); | 158 PageInfoUI::ChosenObjectToUIString(*chosen_object); |
159 | 159 |
160 Java_WebsiteSettingsPopup_addPermissionSection( | 160 Java_WebsiteSettingsPopup_addPermissionSection( |
161 env, popup_jobject_, ConvertUTF16ToJavaString(env, object_title), | 161 env, popup_jobject_, ConvertUTF16ToJavaString(env, object_title), |
162 static_cast<jint>(chosen_object->ui_info.content_settings_type), | 162 static_cast<jint>(chosen_object->ui_info.content_settings_type), |
163 static_cast<jint>(CONTENT_SETTING_ALLOW)); | 163 static_cast<jint>(CONTENT_SETTING_ALLOW)); |
164 } | 164 } |
165 | 165 |
166 Java_WebsiteSettingsPopup_updatePermissionDisplay(env, popup_jobject_); | 166 Java_WebsiteSettingsPopup_updatePermissionDisplay(env, popup_jobject_); |
167 } | 167 } |
168 | 168 |
169 // static | 169 // static |
170 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( | 170 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid( |
171 JNIEnv* env) { | 171 JNIEnv* env) { |
172 return RegisterNativesImpl(env); | 172 return RegisterNativesImpl(env); |
173 } | 173 } |
OLD | NEW |