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

Unified Diff: chrome/browser/browser_about_handler.cc

Issue 2913343002: Start removing deprecated Options UI code (Closed)
Patch Set: thestig@ review Created 3 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/browser_about_handler.cc
diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc
index 8fc14bc3aca4b009e2f52423289b5a081497c45e..9a708c27ef3416f379fb1a5e7d2dfc909d091c69 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -87,31 +87,15 @@ bool WillHandleBrowserAboutURL(GURL* url,
host = chrome::kChromeUIUberHost;
path = chrome::kChromeUIExtensionsHost;
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
- // Redirect chrome://history.
} else if (host == chrome::kChromeUIHistoryHost) {
+ // Redirect chrome://history.
path = url->path();
- // Redirect chrome://settings, unless MD settings is enabled.
} else if (host == chrome::kChromeUISettingsHost) {
- if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
- return true; // Prevent further rewriting - this is a valid URL.
- } else if (::switches::SettingsWindowEnabled()) {
- host = chrome::kChromeUISettingsFrameHost;
- } else {
- host = chrome::kChromeUIUberHost;
- path = chrome::kChromeUISettingsHost + url->path();
- }
- // Redirect chrome://help, unless MD settings is enabled.
+ // Redirect chrome://settings.
+ return true; // Prevent further rewriting - this is a valid URL.
} else if (host == chrome::kChromeUIHelpHost) {
- if (base::FeatureList::IsEnabled(features::kMaterialDesignSettings)) {
- return false; // Handled in the HandleWebUI handler.
- } else if (::switches::SettingsWindowEnabled()) {
- host = chrome::kChromeUISettingsFrameHost;
- if (url->path().empty() || url->path() == "/")
- path = chrome::kChromeUIHelpHost;
- } else {
- host = chrome::kChromeUIUberHost;
- path = chrome::kChromeUIHelpHost + url->path();
- }
+ // Redirect chrome://help, unless MD settings is enabled.
+ return false; // Handled in the HandleWebUI handler.
}
GURL::Replacements replacements;
« no previous file with comments | « chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc ('k') | chrome/browser/browser_about_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698