Index: chrome/browser/ui/android/page_info/website_settings_popup_android.cc |
diff --git a/chrome/browser/ui/android/page_info/website_settings_popup_android.cc b/chrome/browser/ui/android/page_info/website_settings_popup_android.cc |
index 0f4bd98acdcd0843a71291202fb2c1455a9cc70b..85ec46701325cf1504ef4b86d4b25ba1a318da58 100644 |
--- a/chrome/browser/ui/android/page_info/website_settings_popup_android.cc |
+++ b/chrome/browser/ui/android/page_info/website_settings_popup_android.cc |
@@ -12,8 +12,8 @@ |
#include "chrome/browser/infobars/infobar_service.h" |
#include "chrome/browser/profiles/profile.h" |
#include "chrome/browser/ssl/security_state_tab_helper.h" |
-#include "chrome/browser/ui/page_info/website_settings.h" |
-#include "chrome/browser/ui/page_info/website_settings_ui.h" |
+#include "chrome/browser/ui/page_info/page_info.h" |
+#include "chrome/browser/ui/page_info/page_info_ui.h" |
#include "components/content_settings/core/common/content_settings.h" |
#include "components/content_settings/core/common/content_settings_types.h" |
#include "components/security_state/core/security_state.h" |
@@ -65,7 +65,7 @@ WebsiteSettingsPopupAndroid::WebsiteSettingsPopupAndroid( |
SearchGeolocationService::Factory::GetForBrowserContext( |
web_contents->GetBrowserContext()); |
- presenter_.reset(new WebsiteSettings( |
+ presenter_.reset(new PageInfo( |
this, Profile::FromBrowserContext(web_contents->GetBrowserContext()), |
TabSpecificContentSettings::FromWebContents(web_contents), web_contents, |
nav_entry->GetURL(), security_info)); |
@@ -78,18 +78,18 @@ void WebsiteSettingsPopupAndroid::Destroy(JNIEnv* env, |
delete this; |
} |
-void WebsiteSettingsPopupAndroid::RecordWebsiteSettingsAction( |
+void WebsiteSettingsPopupAndroid::RecordPageInfoAction( |
JNIEnv* env, |
const JavaParamRef<jobject>& obj, |
jint action) { |
- presenter_->RecordWebsiteSettingsAction( |
- static_cast<WebsiteSettings::WebsiteSettingsAction>(action)); |
+ presenter_->RecordPageInfoAction( |
+ static_cast<PageInfo::PageInfoAction>(action)); |
} |
void WebsiteSettingsPopupAndroid::SetIdentityInfo( |
const IdentityInfo& identity_info) { |
JNIEnv* env = base::android::AttachCurrentThread(); |
- std::unique_ptr<WebsiteSettingsUI::SecurityDescription> security_description = |
+ std::unique_ptr<PageInfoUI::SecurityDescription> security_description = |
identity_info.GetSecurityDescription(); |
Java_WebsiteSettingsPopup_setSecurityDescription( |
@@ -144,7 +144,7 @@ void WebsiteSettingsPopupAndroid::SetPermissionInfo( |
for (const auto& permission : permissions_to_display) { |
if (base::ContainsKey(user_specified_settings_to_display, permission)) { |
base::string16 setting_title = |
- WebsiteSettingsUI::PermissionTypeToUIString(permission); |
+ PageInfoUI::PermissionTypeToUIString(permission); |
Java_WebsiteSettingsPopup_addPermissionSection( |
env, popup_jobject_, ConvertUTF16ToJavaString(env, setting_title), |
@@ -155,7 +155,7 @@ void WebsiteSettingsPopupAndroid::SetPermissionInfo( |
for (const auto& chosen_object : chosen_object_info_list) { |
base::string16 object_title = |
- WebsiteSettingsUI::ChosenObjectToUIString(*chosen_object); |
+ PageInfoUI::ChosenObjectToUIString(*chosen_object); |
Java_WebsiteSettingsPopup_addPermissionSection( |
env, popup_jobject_, ConvertUTF16ToJavaString(env, object_title), |