Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(342)

Unified Diff: chrome/browser/ui/chrome_pages.cc

Issue 2021343003: MD Site Settings: Add five new top level categories (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address feedback and add icons Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/chrome_pages.cc
diff --git a/chrome/browser/ui/chrome_pages.cc b/chrome/browser/ui/chrome_pages.cc
index 179c0bb9bc2c8e19209f385eda61c6e9e92b2df9..641086e8ac67c66bb44f39b574340e5e1015bf42 100644
--- a/chrome/browser/ui/chrome_pages.cc
+++ b/chrome/browser/ui/chrome_pages.cc
@@ -25,6 +25,7 @@
#include "chrome/browser/ui/singleton_tabs.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
#include "chrome/browser/ui/webui/options/content_settings_handler.h"
+#include "chrome/browser/ui/webui/site_settings_helper.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/url_constants.h"
#include "components/signin/core/browser/signin_header_helper.h"
@@ -129,7 +130,7 @@ void ShowHelpImpl(Browser* browser, Profile* profile, HelpSource source) {
std::string GenerateContentSettingsExceptionsSubPage(ContentSettingsType type) {
return kContentSettingsExceptionsSubPage + std::string(kHashMark) +
- options::ContentSettingsHandler::ContentSettingsTypeToGroupName(type);
+ site_settings::ContentSettingsTypeToGroupName(type);
}
} // namespace
@@ -305,8 +306,7 @@ void ShowContentSettings(Browser* browser,
ShowSettingsSubPage(
browser,
kContentSettingsSubPage + std::string(kHashMark) +
- options::ContentSettingsHandler::ContentSettingsTypeToGroupName(
- content_settings_type));
+ site_settings::ContentSettingsTypeToGroupName(content_settings_type));
}
void ShowClearBrowsingDataDialog(Browser* browser) {

Powered by Google App Engine
This is Rietveld 408576698