summaryrefslogtreecommitdiffstats
path: root/content/browser/webui
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-14 02:47:56 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-14 02:47:56 +0000
commit46ed086c4b827b050b32a123d008bf1004cd1dc8 (patch)
tree9ff943b2668dcc5751b7c5482d8e230705bf7ec7 /content/browser/webui
parentbb25a73494faa944d3c60a02a4e5a2d6b25dc05f (diff)
downloadchromium_src-46ed086c4b827b050b32a123d008bf1004cd1dc8.zip
chromium_src-46ed086c4b827b050b32a123d008bf1004cd1dc8.tar.gz
chromium_src-46ed086c4b827b050b32a123d008bf1004cd1dc8.tar.bz2
content: Move more constants into content namespace.
R=jam@chromium.org Review URL: https://chromiumcodereview.appspot.com/13513004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194115 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/webui')
-rw-r--r--content/browser/webui/content_web_ui_controller_factory.cc24
-rw-r--r--content/browser/webui/shared_resources_data_source.cc2
-rw-r--r--content/browser/webui/url_data_manager_backend.cc6
3 files changed, 16 insertions, 16 deletions
diff --git a/content/browser/webui/content_web_ui_controller_factory.cc b/content/browser/webui/content_web_ui_controller_factory.cc
index 771d5d9..45a38ad 100644
--- a/content/browser/webui/content_web_ui_controller_factory.cc
+++ b/content/browser/webui/content_web_ui_controller_factory.cc
@@ -18,14 +18,14 @@ namespace content {
WebUI::TypeID ContentWebUIControllerFactory::GetWebUIType(
BrowserContext* browser_context, const GURL& url) const {
- if (url.host() == chrome::kChromeUIWebRTCInternalsHost ||
+ if (url.host() == kChromeUIWebRTCInternalsHost ||
#if !defined(OS_ANDROID)
- url.host() == chrome::kChromeUITracingHost ||
+ url.host() == kChromeUITracingHost ||
#endif
- url.host() == chrome::kChromeUIGpuHost ||
- url.host() == chrome::kChromeUIIndexedDBInternalsHost ||
- url.host() == chrome::kChromeUIMediaInternalsHost ||
- url.host() == chrome::kChromeUIAccessibilityHost) {
+ url.host() == kChromeUIGpuHost ||
+ url.host() == kChromeUIIndexedDBInternalsHost ||
+ url.host() == kChromeUIMediaInternalsHost ||
+ url.host() == kChromeUIAccessibilityHost) {
return const_cast<ContentWebUIControllerFactory*>(this);
}
return WebUI::kNoWebUI;
@@ -43,18 +43,18 @@ bool ContentWebUIControllerFactory::UseWebUIBindingsForURL(
WebUIController* ContentWebUIControllerFactory::CreateWebUIControllerForURL(
WebUI* web_ui, const GURL& url) const {
- if (url.host() == chrome::kChromeUIWebRTCInternalsHost)
+ if (url.host() == kChromeUIWebRTCInternalsHost)
return new WebRTCInternalsUI(web_ui);
- if (url.host() == chrome::kChromeUIGpuHost)
+ if (url.host() == kChromeUIGpuHost)
return new GpuInternalsUI(web_ui);
- if (url.host() == chrome::kChromeUIIndexedDBInternalsHost)
+ if (url.host() == kChromeUIIndexedDBInternalsHost)
return new IndexedDBInternalsUI(web_ui);
- if (url.host() == chrome::kChromeUIMediaInternalsHost)
+ if (url.host() == kChromeUIMediaInternalsHost)
return new MediaInternalsUI(web_ui);
- if (url.host() == chrome::kChromeUIAccessibilityHost)
+ if (url.host() == kChromeUIAccessibilityHost)
return new AccessibilityUI(web_ui);
#if !defined(OS_ANDROID)
- if (url.host() == chrome::kChromeUITracingHost)
+ if (url.host() == kChromeUITracingHost)
return new TracingUI(web_ui);
#endif
diff --git a/content/browser/webui/shared_resources_data_source.cc b/content/browser/webui/shared_resources_data_source.cc
index 54c0c4c..83f8486 100644
--- a/content/browser/webui/shared_resources_data_source.cc
+++ b/content/browser/webui/shared_resources_data_source.cc
@@ -35,7 +35,7 @@ SharedResourcesDataSource::~SharedResourcesDataSource() {
}
std::string SharedResourcesDataSource::GetSource() {
- return chrome::kChromeUIResourcesHost;
+ return content::kChromeUIResourcesHost;
}
void SharedResourcesDataSource::StartDataRequest(
diff --git a/content/browser/webui/url_data_manager_backend.cc b/content/browser/webui/url_data_manager_backend.cc
index f29e07b..102f61c 100644
--- a/content/browser/webui/url_data_manager_backend.cc
+++ b/content/browser/webui/url_data_manager_backend.cc
@@ -379,7 +379,7 @@ class ChromeProtocolHandler
// Next check for chrome://appcache-internals/, which uses its own job type.
if (request->url().SchemeIs(chrome::kChromeUIScheme) &&
- request->url().host() == chrome::kChromeUIAppCacheInternalsHost) {
+ request->url().host() == kChromeUIAppCacheInternalsHost) {
return appcache::ViewAppCacheInternalsJobFactory::CreateJobForRequest(
request, network_delegate, appcache_service_);
}
@@ -393,14 +393,14 @@ class ChromeProtocolHandler
#if defined(USE_TCMALLOC)
// Next check for chrome://tcmalloc/, which uses its own job type.
if (request->url().SchemeIs(chrome::kChromeUIScheme) &&
- request->url().host() == chrome::kChromeUITcmallocHost) {
+ request->url().host() == kChromeUITcmallocHost) {
return new TcmallocInternalsRequestJob(request, network_delegate);
}
#endif
// Next check for chrome://histograms/, which uses its own job type.
if (request->url().SchemeIs(chrome::kChromeUIScheme) &&
- request->url().host() == chrome::kChromeUIHistogramHost) {
+ request->url().host() == kChromeUIHistogramHost) {
return new HistogramInternalsRequestJob(request, network_delegate);
}