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

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_controller_factory.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
« no previous file with comments | « chrome/browser/ui/browser_navigator.cc ('k') | chrome/browser/ui/webui/md_history_ui.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
index 5be5b1ff8e98754315b7ea9c5559b7d09498c206..45433fe5ef4c507a65b53d895ef985becac56b8c 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -80,6 +80,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_ui.h"
#include "content/public/common/content_client.h"
+#include "content/public/common/url_constants.h"
#include "content/public/common/url_utils.h"
#include "device/vr/features.h"
#include "extensions/features/features.h"
@@ -437,7 +438,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* web_ui,
}
// Material Design history is on its own host, rather than on an Uber page.
if (base::FeatureList::IsEnabled(features::kMaterialDesignHistory) &&
- url.host_piece() == chrome::kChromeUIHistoryHost) {
+ url.host_piece() == content::kChromeUIHistoryHost) {
return &NewWebUI<MdHistoryUI>;
}
// Material Design Settings gets its own host, if enabled.
@@ -796,7 +797,7 @@ base::RefCountedMemory* ChromeWebUIControllerFactory::GetFaviconResourceBytes(
if (page_url.host_piece() == chrome::kChromeUIFlagsHost)
return FlagsUI::GetFaviconResourceBytes(scale_factor);
- if (page_url.host_piece() == chrome::kChromeUIHistoryHost)
+ if (page_url.host_piece() == content::kChromeUIHistoryHost)
return HistoryUI::GetFaviconResourceBytes(scale_factor);
#if !defined(OS_ANDROID)
« no previous file with comments | « chrome/browser/ui/browser_navigator.cc ('k') | chrome/browser/ui/webui/md_history_ui.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698