diff options
20 files changed, 52 insertions, 50 deletions
diff --git a/chrome/browser/autocomplete/builtin_provider_unittest.cc b/chrome/browser/autocomplete/builtin_provider_unittest.cc index b98f768..5f67f1a 100644 --- a/chrome/browser/autocomplete/builtin_provider_unittest.cc +++ b/chrome/browser/autocomplete/builtin_provider_unittest.cc @@ -144,7 +144,7 @@ TEST_F(BuiltinProviderTest, ChromeURLs) { // This makes assumptions about the chrome URLs listed by the BuiltinProvider. // Currently they are derived from ChromePaths() in browser_about_handler.cc. - const string16 kHostM1 = ASCIIToUTF16(chrome::kChromeUIMediaInternalsHost); + const string16 kHostM1 = ASCIIToUTF16(content::kChromeUIMediaInternalsHost); const string16 kHostM2 = ASCIIToUTF16(chrome::kChromeUIMemoryHost); const GURL kURLM1 = GURL(kChrome + kSeparator3 + kHostM1); const GURL kURLM2 = GURL(kChrome + kSeparator3 + kHostM2); diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index b09c624..0bc85ec 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -21,25 +21,19 @@ namespace { // Add paths here to be included in chrome://chrome-urls (about:about). // These paths will also be suggested by BuiltinProvider. const char* const kPaths[] = { - chrome::kChromeUIAccessibilityHost, - chrome::kChromeUIAppCacheInternalsHost, - chrome::kChromeUIBlobInternalsHost, chrome::kChromeUICacheHost, chrome::kChromeUIChromeURLsHost, chrome::kChromeUICrashesHost, chrome::kChromeUICreditsHost, chrome::kChromeUIDNSHost, chrome::kChromeUIFlagsHost, - chrome::kChromeUIGpuHost, chrome::kChromeUIHistoryHost, chrome::kChromeUIIPCHost, - chrome::kChromeUIMediaInternalsHost, chrome::kChromeUIMemoryHost, #if defined(OS_ANDROID) || defined(OS_IOS) chrome::kChromeUINetExportHost, #endif chrome::kChromeUINetInternalsHost, - chrome::kChromeUINetworkViewCacheHost, chrome::kChromeUINewTabHost, chrome::kChromeUIOmniboxHost, chrome::kChromeUIPredictorsHost, @@ -60,8 +54,6 @@ const char* const kPaths[] = { chrome::kChromeUIInspectHost, chrome::kChromeUIPluginsHost, chrome::kChromeUISettingsHost, - chrome::kChromeUITracingHost, - chrome::kChromeUIWebRTCInternalsHost, #endif #if defined(OS_WIN) chrome::kChromeUIConflictsHost, @@ -98,6 +90,14 @@ const char* const kPaths[] = { #if defined(ENABLE_PRINTING) chrome::kChromeUIPrintHost, #endif + content::kChromeUIAccessibilityHost, + content::kChromeUIAppCacheInternalsHost, + content::kChromeUIBlobInternalsHost, + content::kChromeUIGpuHost, + content::kChromeUIMediaInternalsHost, + content::kChromeUINetworkViewCacheHost, + content::kChromeUITracingHost, + content::kChromeUIWebRTCInternalsHost, }; } // namespace @@ -123,7 +123,7 @@ bool WillHandleBrowserAboutURL(GURL* url, host = chrome::kChromeUIChromeURLsHost; // Replace cache with view-http-cache. if (host == chrome::kChromeUICacheHost) { - host = chrome::kChromeUINetworkViewCacheHost; + host = content::kChromeUINetworkViewCacheHost; // Replace sync with sync-internals (for legacy reasons). } else if (host == chrome::kChromeUISyncHost) { host = chrome::kChromeUISyncInternalsHost; diff --git a/chrome/browser/browser_about_handler_unittest.cc b/chrome/browser/browser_about_handler_unittest.cc index a7c1341..54f45f2 100644 --- a/chrome/browser/browser_about_handler_unittest.cc +++ b/chrome/browser/browser_about_handler_unittest.cc @@ -45,7 +45,7 @@ TEST_F(BrowserAboutHandlerTest, WillHandleBrowserAboutURL) { }, { GURL(chrome_prefix + chrome::kChromeUICacheHost), - GURL(chrome_prefix + chrome::kChromeUINetworkViewCacheHost) + GURL(chrome_prefix + content::kChromeUINetworkViewCacheHost) }, { GURL(chrome_prefix + chrome::kChromeUISignInInternalsHost), diff --git a/chrome/browser/extensions/extension_tab_util.cc b/chrome/browser/extensions/extension_tab_util.cc index 0a97e7e..ed1f25c 100644 --- a/chrome/browser/extensions/extension_tab_util.cc +++ b/chrome/browser/extensions/extension_tab_util.cc @@ -271,7 +271,7 @@ bool ExtensionTabUtil::IsCrashURL(const GURL& url) { GURL fixed_url = URLFixerUpper::FixupURL(url.possibly_invalid_spec(), std::string()); return (fixed_url.SchemeIs(chrome::kChromeUIScheme) && - (fixed_url.host() == chrome::kChromeUIBrowserCrashHost || + (fixed_url.host() == content::kChromeUIBrowserCrashHost || fixed_url.host() == chrome::kChromeUICrashHost)); } diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index 6a5d05a..c3f484f 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -1918,7 +1918,7 @@ IN_PROC_BROWSER_TEST_F(PolicyStatisticsCollectorTest, Startup) { GURL kAboutHistograms = GURL(std::string(chrome::kAboutScheme) + std::string(content::kStandardSchemeSeparator) + - std::string(chrome::kChromeUIHistogramHost)); + std::string(content::kChromeUIHistogramHost)); ui_test_utils::NavigateToURL(browser(), kAboutHistograms); content::WebContents* contents = browser()->tab_strip_model()->GetActiveWebContents(); 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); } diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc index 7a69c1b..1a03fa5 100644 --- a/content/public/common/url_constants.cc +++ b/content/public/common/url_constants.cc @@ -32,6 +32,11 @@ const char kViewSourceScheme[] = "view-source"; const char kAboutBlankURL[] = "about:blank"; const char kAboutSrcDocURL[] = "about:srcdoc"; + +} // namespace chrome + +namespace content { + const char kChromeUIAppCacheInternalsHost[] = "appcache-internals"; const char kChromeUIIndexedDBInternalsHost[] = "indexeddb-internals"; const char kChromeUIAccessibilityHost[] = "accessibility"; @@ -46,10 +51,6 @@ const char kChromeUITcmallocHost[] = "tcmalloc"; const char kChromeUITracingHost[] = "tracing"; const char kChromeUIWebRTCInternalsHost[] = "webrtc-internals"; -} // namespace chrome - -namespace content { - const char kChromeUICrashURL[] = "chrome://crash"; const char kChromeUIGpuCleanURL[] = "chrome://gpuclean"; const char kChromeUIGpuCrashURL[] = "chrome://gpucrash"; diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h index c470452..515a45f 100644 --- a/content/public/common/url_constants.h +++ b/content/public/common/url_constants.h @@ -27,7 +27,6 @@ CONTENT_EXPORT extern const char kFileScheme[]; CONTENT_EXPORT extern const char kFileSystemScheme[]; CONTENT_EXPORT extern const char kFtpScheme[]; CONTENT_EXPORT extern const char kGuestScheme[]; -CONTENT_EXPORT extern const char kChromeUIGpuHost[]; CONTENT_EXPORT extern const char kHttpScheme[]; CONTENT_EXPORT extern const char kHttpsScheme[]; CONTENT_EXPORT extern const char kJavaScriptScheme[]; @@ -39,10 +38,16 @@ CONTENT_EXPORT extern const char kViewSourceScheme[]; // Hosts for about URLs. CONTENT_EXPORT extern const char kAboutBlankURL[]; CONTENT_EXPORT extern const char kAboutSrcDocURL[]; + +} // namespace chrome + +namespace content { + CONTENT_EXPORT extern const char kChromeUIAccessibilityHost[]; CONTENT_EXPORT extern const char kChromeUIAppCacheInternalsHost[]; CONTENT_EXPORT extern const char kChromeUIBlobInternalsHost[]; CONTENT_EXPORT extern const char kChromeUIBrowserCrashHost[]; +CONTENT_EXPORT extern const char kChromeUIGpuHost[]; CONTENT_EXPORT extern const char kChromeUIHistogramHost[]; CONTENT_EXPORT extern const char kChromeUIIndexedDBInternalsHost[]; CONTENT_EXPORT extern const char kChromeUIMediaInternalsHost[]; @@ -52,10 +57,6 @@ CONTENT_EXPORT extern const char kChromeUITcmallocHost[]; CONTENT_EXPORT extern const char kChromeUITracingHost[]; CONTENT_EXPORT extern const char kChromeUIWebRTCInternalsHost[]; -} // namespace chrome - -namespace content { - // Full about URLs (including schemes). CONTENT_EXPORT extern const char kChromeUICrashURL[]; CONTENT_EXPORT extern const char kChromeUIGpuCleanURL[]; |