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

Unified Diff: chrome/browser/browser_about_handler.cc

Issue 2751653004: MD History: re-use history host constant from content/ instead of duplicating to chrome/ (Closed)
Patch Set: merge Created 3 years, 9 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 a89d62b817375383b7648ce2fd1c6227bcbe737e..96c0189a0006c579826dc135d95f151de0c89700 100644
--- a/chrome/browser/browser_about_handler.cc
+++ b/chrome/browser/browser_about_handler.cc
@@ -21,6 +21,7 @@
#include "chrome/common/url_constants.h"
#include "components/url_formatter/url_fixer.h"
#include "content/public/common/content_features.h"
+#include "content/public/common/url_constants.h"
#include "extensions/features/features.h"
#if !defined(OS_ANDROID)
@@ -86,7 +87,7 @@ bool WillHandleBrowserAboutURL(GURL* url,
path = chrome::kChromeUIExtensionsHost;
#endif // BUILDFLAG(ENABLE_EXTENSIONS)
// Redirect chrome://history.
- } else if (host == chrome::kChromeUIHistoryHost) {
+ } else if (host == content::kChromeUIHistoryHost) {
#if defined(OS_ANDROID)
// TODO(twellington): remove this after native Android history launches.
// See http://crbug.com/654071.
@@ -99,11 +100,11 @@ bool WillHandleBrowserAboutURL(GURL* url,
// Material design history is handled on the top-level chrome://history
// host.
if (base::FeatureList::IsEnabled(features::kMaterialDesignHistory)) {
- host = chrome::kChromeUIHistoryHost;
+ host = content::kChromeUIHistoryHost;
path = url->path();
} else {
host = chrome::kChromeUIUberHost;
- path = chrome::kChromeUIHistoryHost + url->path();
+ path = content::kChromeUIHistoryHost + url->path();
}
#endif
// Redirect chrome://settings, unless MD settings is enabled.
« no previous file with comments | « chrome/browser/android/ntp/new_tab_page_url_handler.cc ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698