Index: chrome/browser/ui/chrome_pages.cc |
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc |
index ce47b60929dbfeb31852d4431c9ca357b63f8a44..2f0dcb6debf6378945e7ec9fdfce9d95574fb8fb 100644 |
--- a/chrome/browser/ui/chrome_pages.cc |
+++ b/chrome/browser/ui/chrome_pages.cc |
@@ -142,20 +142,15 @@ void ShowHelpImpl(Browser* browser, Profile* profile, HelpSource source) { |
} |
std::string GenerateContentSettingsExceptionsSubPage(ContentSettingsType type) { |
- if (!base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) { |
- return kDeprecatedOptionsContentSettingsExceptionsSubPage + |
- std::string(kHashMark) + |
- site_settings::ContentSettingsTypeToGroupName(type); |
- } |
- |
// In MD Settings, the exceptions no longer have a separate subpage. |
// This list overrides the group names defined in site_settings_helper for the |
// purposes of URL generation for MD Settings only. We need this because some |
// of the old group names are no longer appropriate: i.e. "plugins" => |
// "flash". |
// |
- // TODO(tommycli): Update the group names defined in site_settings_helper once |
- // Options is removed from Chrome. Then this list will no longer be needed. |
+ // TODO(crbug.com/728353): Update the group names defined in |
+ // site_settings_helper once Options is removed from Chrome. Then this list |
+ // will no longer be needed. |
typedef std::map<ContentSettingsType, std::string> ContentSettingPathMap; |
CR_DEFINE_STATIC_LOCAL( |
ContentSettingPathMap, kSettingsPathOverrides, |
@@ -175,13 +170,6 @@ std::string GenerateContentSettingsExceptionsSubPage(ContentSettingsType type) { |
return std::string(kContentSettingsSubPage) + "/" + content_type_path; |
} |
-#if defined(OS_CHROMEOS) |
-std::string GenerateContentSettingsSearchQueryPath(int query_message_id) { |
- return std::string(chrome::kDeprecatedOptionsSearchSubPage) + kHashMark + |
- l10n_util::GetStringUTF8(query_message_id); |
-} |
-#endif |
- |
} // namespace |
void ShowBookmarkManager(Browser* browser) { |
@@ -317,24 +305,6 @@ void ShowSettingsSubPageForProfile(Profile* profile, |
const std::string& sub_page) { |
std::string sub_page_path = sub_page; |
-#if defined(OS_CHROMEOS) |
- if (!base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) { |
- if (sub_page == chrome::kAccessibilitySubPage) { |
- sub_page_path = GenerateContentSettingsSearchQueryPath( |
- IDS_OPTIONS_SETTINGS_SECTION_TITLE_ACCESSIBILITY); |
- } else if (sub_page == chrome::kBluetoothSubPage) { |
- sub_page_path = GenerateContentSettingsSearchQueryPath( |
- IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH); |
- } else if (sub_page == chrome::kDateTimeSubPage) { |
- sub_page_path = GenerateContentSettingsSearchQueryPath( |
- IDS_OPTIONS_SETTINGS_SECTION_TITLE_DATETIME); |
- } else if (sub_page == chrome::kStylusSubPage || |
- sub_page == chrome::kPowerSubPage) { |
- sub_page_path += "-overlay"; |
- } |
- } |
-#endif |
- |
if (::switches::SettingsWindowEnabled()) { |
base::RecordAction(base::UserMetricsAction("ShowOptions")); |
SettingsWindowManager::GetInstance()->ShowChromePageForProfile( |