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..aaa4d55d69c45b59280381a4e7d595ef17357695 100644 |
--- a/chrome/browser/ui/chrome_pages.cc |
+++ b/chrome/browser/ui/chrome_pages.cc |
@@ -142,12 +142,6 @@ 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. |
dpapad
2017/06/01 00:12:54
This comment contrasts old and new, but it seems a
Dan Beam
2017/06/03 00:11:02
Acknowledged.
|
// 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 |
@@ -317,24 +311,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( |