summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/accessibility/accessibility_ui.cc2
-rw-r--r--content/browser/gpu/gpu_internals_ui.cc2
-rw-r--r--content/browser/in_process_webkit/indexed_db_browsertest.cc2
-rw-r--r--content/browser/indexed_db/indexed_db_internals_ui.cc5
-rw-r--r--content/browser/media/media_internals_ui.cc2
-rw-r--r--content/browser/media/webrtc_internals_ui.cc2
-rw-r--r--content/browser/net/view_blob_internals_job_factory.cc2
-rw-r--r--content/browser/net/view_http_cache_job_factory.cc2
-rw-r--r--content/browser/tracing/tracing_ui.cc3
-rw-r--r--content/browser/web_contents/debug_urls.cc2
-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
13 files changed, 28 insertions, 28 deletions
diff --git a/content/browser/accessibility/accessibility_ui.cc b/content/browser/accessibility/accessibility_ui.cc
index 88bc566..0208214 100644
--- a/content/browser/accessibility/accessibility_ui.cc
+++ b/content/browser/accessibility/accessibility_ui.cc
@@ -146,7 +146,7 @@ AccessibilityUI::AccessibilityUI(WebUI* web_ui)
: WebUIController(web_ui) {
// Set up the chrome://accessibility source.
WebUIDataSource* html_source =
- WebUIDataSource::Create(chrome::kChromeUIAccessibilityHost);
+ WebUIDataSource::Create(kChromeUIAccessibilityHost);
html_source->SetUseJsonJSFormatV2();
web_ui->RegisterMessageCallback(
diff --git a/content/browser/gpu/gpu_internals_ui.cc b/content/browser/gpu/gpu_internals_ui.cc
index e2d1140..6f589c8 100644
--- a/content/browser/gpu/gpu_internals_ui.cc
+++ b/content/browser/gpu/gpu_internals_ui.cc
@@ -43,7 +43,7 @@ struct GpuFeatureInfo {
};
WebUIDataSource* CreateGpuHTMLSource() {
- WebUIDataSource* source = WebUIDataSource::Create(chrome::kChromeUIGpuHost);
+ WebUIDataSource* source = WebUIDataSource::Create(kChromeUIGpuHost);
source->SetJsonPath("strings.js");
source->AddResourcePath("gpu_internals.js", IDR_GPU_INTERNALS_JS);
diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc
index 5a995f0..f962e1d 100644
--- a/content/browser/in_process_webkit/indexed_db_browsertest.cc
+++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc
@@ -390,7 +390,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest,
IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, PRE_VersionChangeCrashResilience) {
NavigateAndWaitForTitle(shell(), "version_change_crash.html", "#part2",
"pass - part2 - crash me");
- NavigateToURL(shell(), GURL(chrome::kChromeUIBrowserCrashHost));
+ NavigateToURL(shell(), GURL(kChromeUIBrowserCrashHost));
}
IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, VersionChangeCrashResilience) {
diff --git a/content/browser/indexed_db/indexed_db_internals_ui.cc b/content/browser/indexed_db/indexed_db_internals_ui.cc
index 6d0871c..499dd3c 100644
--- a/content/browser/indexed_db/indexed_db_internals_ui.cc
+++ b/content/browser/indexed_db/indexed_db_internals_ui.cc
@@ -28,7 +28,7 @@ IndexedDBInternalsUI::IndexedDBInternalsUI(WebUI* web_ui)
base::Unretained(this)));
WebUIDataSource* source =
- WebUIDataSource::Create(chrome::kChromeUIIndexedDBInternalsHost);
+ WebUIDataSource::Create(kChromeUIIndexedDBInternalsHost);
source->SetUseJsonJSFormatV2();
source->SetJsonPath("strings.js");
source->AddResourcePath("indexeddb_internals.js",
@@ -96,4 +96,5 @@ void IndexedDBInternalsUI::OnOriginsReady(
}
web_ui()->CallJavascriptFunction("indexeddb.onOriginsReady", urls);
}
-}
+
+} // namespace content
diff --git a/content/browser/media/media_internals_ui.cc b/content/browser/media/media_internals_ui.cc
index f35395e..812825d 100644
--- a/content/browser/media/media_internals_ui.cc
+++ b/content/browser/media/media_internals_ui.cc
@@ -16,7 +16,7 @@ namespace {
WebUIDataSource* CreateMediaInternalsHTMLSource() {
WebUIDataSource* source =
- WebUIDataSource::Create(chrome::kChromeUIMediaInternalsHost);
+ WebUIDataSource::Create(kChromeUIMediaInternalsHost);
source->SetJsonPath("strings.js");
source->AddResourcePath("media_internals.js", IDR_MEDIA_INTERNALS_JS);
diff --git a/content/browser/media/webrtc_internals_ui.cc b/content/browser/media/webrtc_internals_ui.cc
index 2137acb..5c4adc5 100644
--- a/content/browser/media/webrtc_internals_ui.cc
+++ b/content/browser/media/webrtc_internals_ui.cc
@@ -16,7 +16,7 @@ namespace {
WebUIDataSource* CreateWebRTCInternalsHTMLSource() {
WebUIDataSource* source =
- WebUIDataSource::Create(chrome::kChromeUIWebRTCInternalsHost);
+ WebUIDataSource::Create(kChromeUIWebRTCInternalsHost);
source->SetJsonPath("strings.js");
source->AddResourcePath("webrtc_internals.js", IDR_WEBRTC_INTERNALS_JS);
diff --git a/content/browser/net/view_blob_internals_job_factory.cc b/content/browser/net/view_blob_internals_job_factory.cc
index eeb87fa..1eab44b 100644
--- a/content/browser/net/view_blob_internals_job_factory.cc
+++ b/content/browser/net/view_blob_internals_job_factory.cc
@@ -14,7 +14,7 @@ namespace content {
// static.
bool ViewBlobInternalsJobFactory::IsSupportedURL(const GURL& url) {
return url.SchemeIs(chrome::kChromeUIScheme) &&
- url.host() == chrome::kChromeUIBlobInternalsHost;
+ url.host() == kChromeUIBlobInternalsHost;
}
// static.
diff --git a/content/browser/net/view_http_cache_job_factory.cc b/content/browser/net/view_http_cache_job_factory.cc
index a1300e6..dad1ea5 100644
--- a/content/browser/net/view_http_cache_job_factory.cc
+++ b/content/browser/net/view_http_cache_job_factory.cc
@@ -193,7 +193,7 @@ void ViewHttpCacheJob::Core::OnIOComplete(int result) {
// Static.
bool ViewHttpCacheJobFactory::IsSupportedURL(const GURL& url) {
return url.SchemeIs(chrome::kChromeUIScheme) &&
- url.host() == chrome::kChromeUINetworkViewCacheHost;
+ url.host() == kChromeUINetworkViewCacheHost;
}
// Static.
diff --git a/content/browser/tracing/tracing_ui.cc b/content/browser/tracing/tracing_ui.cc
index 40bbee3..373a3f7 100644
--- a/content/browser/tracing/tracing_ui.cc
+++ b/content/browser/tracing/tracing_ui.cc
@@ -40,8 +40,7 @@ namespace content {
namespace {
WebUIDataSource* CreateTracingHTMLSource() {
- WebUIDataSource* source =
- WebUIDataSource::Create(chrome::kChromeUITracingHost);
+ WebUIDataSource* source = WebUIDataSource::Create(kChromeUITracingHost);
source->SetJsonPath("strings.js");
source->SetDefaultResource(IDR_TRACING_HTML);
diff --git a/content/browser/web_contents/debug_urls.cc b/content/browser/web_contents/debug_urls.cc
index f62f0b3..c321b055 100644
--- a/content/browser/web_contents/debug_urls.cc
+++ b/content/browser/web_contents/debug_urls.cc
@@ -42,7 +42,7 @@ bool HandleDebugURL(const GURL& url, PageTransition transition) {
if (!(transition & PAGE_TRANSITION_FROM_ADDRESS_BAR))
return false;
- if (url.host() == chrome::kChromeUIBrowserCrashHost) {
+ if (url.host() == kChromeUIBrowserCrashHost) {
// Induce an intentional crash in the browser process.
CHECK(false);
return true;
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);
}