summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-15 04:59:20 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-15 04:59:20 +0000
commit081dc52eca580aac97c10afd31d50a177c8d4712 (patch)
treebb0015b11ac82edcd766dee04dd2e0207389e7f3 /content
parent12a936dc0f2334a1aa94e78b9fc62cf59c8e9acd (diff)
downloadchromium_src-081dc52eca580aac97c10afd31d50a177c8d4712.zip
chromium_src-081dc52eca580aac97c10afd31d50a177c8d4712.tar.gz
chromium_src-081dc52eca580aac97c10afd31d50a177c8d4712.tar.bz2
content: Move two more url constants into content namespace.
TBR=joi@chromium.org, thestig@chromium.org Review URL: https://codereview.chromium.org/14698018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@200165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/accessibility/accessibility_win_browsertest.cc4
-rw-r--r--content/browser/browser_url_handler_impl.cc2
-rw-r--r--content/browser/child_process_security_policy_impl.cc2
-rw-r--r--content/browser/devtools/devtools_http_handler_impl.cc2
-rw-r--r--content/browser/in_process_webkit/indexed_db_browsertest.cc2
-rw-r--r--content/browser/renderer_host/render_view_host_impl.cc8
-rw-r--r--content/browser/renderer_host/render_view_host_manager_browsertest.cc2
-rw-r--r--content/browser/session_history_browsertest.cc4
-rw-r--r--content/browser/web_contents/web_contents_impl.cc8
-rw-r--r--content/browser/web_contents/web_contents_impl_unittest.cc5
-rw-r--r--content/browser/webui/web_ui_controller_factory_registry.cc2
-rw-r--r--content/public/common/url_constants.cc6
-rw-r--r--content/public/common/url_constants.h8
-rw-r--r--content/renderer/render_view_impl.cc10
-rw-r--r--content/shell/shell_devtools_delegate.cc2
-rw-r--r--content/test/content_browser_test.cc4
16 files changed, 35 insertions, 36 deletions
diff --git a/content/browser/accessibility/accessibility_win_browsertest.cc b/content/browser/accessibility/accessibility_win_browsertest.cc
index b099af9d..d0800f1 100644
--- a/content/browser/accessibility/accessibility_win_browsertest.cc
+++ b/content/browser/accessibility/accessibility_win_browsertest.cc
@@ -432,7 +432,7 @@ string16 AccessibleChecker::RoleVariantToString(
IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
MAYBE(TestBusyAccessibilityTree)) {
- NavigateToURL(shell(), GURL(chrome::kAboutBlankURL));
+ NavigateToURL(shell(), GURL(kAboutBlankURL));
// The initial accessible returned should have state STATE_SYSTEM_BUSY while
// the accessibility tree is being requested from the renderer.
@@ -476,7 +476,7 @@ IN_PROC_BROWSER_TEST_F(AccessibilityWinBrowserTest,
EXPECT_NE(parent_dispatch, reinterpret_cast<IDispatch*>(NULL));
// Navigate to another page.
- NavigateToURL(shell(), GURL(chrome::kAboutBlankURL));
+ NavigateToURL(shell(), GURL(kAboutBlankURL));
// Verify that the IAccessible reference still points to a valid object and
// that calls to its methods fail since the tree is no longer valid after
diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc
index e10e997..126e485 100644
--- a/content/browser/browser_url_handler_impl.cc
+++ b/content/browser/browser_url_handler_impl.cc
@@ -36,7 +36,7 @@ static bool HandleViewSource(GURL* url,
}
if (!is_sub_scheme_allowed) {
- *url = GURL(chrome::kAboutBlankURL);
+ *url = GURL(kAboutBlankURL);
return false;
}
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
index 45694fa..021fa0a 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -547,7 +547,7 @@ bool ChildProcessSecurityPolicyImpl::CanRequestURL(
return CanRequestURL(child_id, child_url);
}
- if (LowerCaseEqualsASCII(url.spec(), chrome::kAboutBlankURL))
+ if (LowerCaseEqualsASCII(url.spec(), kAboutBlankURL))
return true; // Every child process can request <about:blank>.
// URLs like <about:memory> and <about:crash> shouldn't be requestable by
diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc
index cea2156..4e9bb66 100644
--- a/content/browser/devtools/devtools_http_handler_impl.cc
+++ b/content/browser/devtools/devtools_http_handler_impl.cc
@@ -489,7 +489,7 @@ void DevToolsHttpHandlerImpl::OnJsonRequestUI(
version.SetString("Browser",
content::GetContentClient()->GetProduct());
version.SetString("User-Agent",
- webkit_glue::GetUserAgent(GURL(chrome::kAboutBlankURL)));
+ webkit_glue::GetUserAgent(GURL(kAboutBlankURL)));
SendJson(connection_id, net::HTTP_OK, &version, std::string());
return;
}
diff --git a/content/browser/in_process_webkit/indexed_db_browsertest.cc b/content/browser/in_process_webkit/indexed_db_browsertest.cc
index 163cfe6..0c42c6c 100644
--- a/content/browser/in_process_webkit/indexed_db_browsertest.cc
+++ b/content/browser/in_process_webkit/indexed_db_browsertest.cc
@@ -406,7 +406,7 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, ConnectionsClosedOnTabClose) {
// Start on a different URL to force a new renderer process.
Shell* new_shell = CreateBrowser();
- NavigateToURL(new_shell, GURL(chrome::kAboutBlankURL));
+ NavigateToURL(new_shell, GURL(kAboutBlankURL));
NavigateAndWaitForTitle(new_shell, "version_change_blocked.html", "#tab2",
"setVersion(3) blocked");
diff --git a/content/browser/renderer_host/render_view_host_impl.cc b/content/browser/renderer_host/render_view_host_impl.cc
index b34ce2b..d581538 100644
--- a/content/browser/renderer_host/render_view_host_impl.cc
+++ b/content/browser/renderer_host/render_view_host_impl.cc
@@ -1207,7 +1207,7 @@ void RenderViewHostImpl::OnNavigate(const IPC::Message& msg) {
// should be killed.
if (!CanCommitURL(validated_params.url)) {
VLOG(1) << "Blocked URL " << validated_params.url.spec();
- validated_params.url = GURL(chrome::kAboutBlankURL);
+ validated_params.url = GURL(kAboutBlankURL);
RecordAction(UserMetricsAction("CanCommitURL_BlockedAndKilled"));
// Kills the process.
process->ReceivedBadMessage();
@@ -1725,7 +1725,7 @@ void RenderViewHostImpl::FilterURL(ChildProcessSecurityPolicyImpl* policy,
// This is because the browser treats navigation to an empty GURL as a
// navigation to the home page. This is often a privileged page
// (chrome://newtab/) which is exactly what we don't want.
- *url = GURL(chrome::kAboutBlankURL);
+ *url = GURL(kAboutBlankURL);
RecordAction(UserMetricsAction("FilterURLTermiate_Invalid"));
return;
}
@@ -1733,7 +1733,7 @@ void RenderViewHostImpl::FilterURL(ChildProcessSecurityPolicyImpl* policy,
if (url->SchemeIs(chrome::kAboutScheme)) {
// The renderer treats all URLs in the about: scheme as being about:blank.
// Canonicalize about: URLs to about:blank.
- *url = GURL(chrome::kAboutBlankURL);
+ *url = GURL(kAboutBlankURL);
RecordAction(UserMetricsAction("FilterURLTermiate_About"));
}
@@ -1747,7 +1747,7 @@ void RenderViewHostImpl::FilterURL(ChildProcessSecurityPolicyImpl* policy,
// URL. This prevents us from storing the blocked URL and becoming confused
// later.
VLOG(1) << "Blocked URL " << url->spec();
- *url = GURL(chrome::kAboutBlankURL);
+ *url = GURL(kAboutBlankURL);
RecordAction(UserMetricsAction("FilterURLTermiate_Blocked"));
}
}
diff --git a/content/browser/renderer_host/render_view_host_manager_browsertest.cc b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
index 9000c69..ab71911 100644
--- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
@@ -839,7 +839,7 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, ClickLinkAfter204Error) {
// do not cause back/forward navigations to be considered stale by the
// renderer.
IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, BackForwardNotStale) {
- NavigateToURL(shell(), GURL(chrome::kAboutBlankURL));
+ NavigateToURL(shell(), GURL(kAboutBlankURL));
// Start two servers with different sites.
ASSERT_TRUE(test_server()->Start());
diff --git a/content/browser/session_history_browsertest.cc b/content/browser/session_history_browsertest.cc
index 5de632a..b2698b9d 100644
--- a/content/browser/session_history_browsertest.cc
+++ b/content/browser/session_history_browsertest.cc
@@ -25,7 +25,7 @@ class SessionHistoryTest : public ContentBrowserTest {
virtual void SetUpOnMainThread() OVERRIDE {
ASSERT_TRUE(test_server()->Start());
- NavigateToURL(shell(), GURL(chrome::kAboutBlankURL));
+ NavigateToURL(shell(), GURL(kAboutBlankURL));
}
// Simulate clicking a link. Only works on the frames.html testserver page.
@@ -176,7 +176,7 @@ IN_PROC_BROWSER_TEST_F(SessionHistoryTest, FrameBackForward) {
GoBack();
EXPECT_EQ("about:blank", GetTabTitle());
- EXPECT_EQ(GURL(chrome::kAboutBlankURL), GetTabURL());
+ EXPECT_EQ(GURL(kAboutBlankURL), GetTabURL());
GoForward();
EXPECT_EQ("bot1", GetTabTitle());
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 9cc3694..47a984c 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -574,7 +574,7 @@ WebPreferences WebContentsImpl::GetWebkitPrefs(RenderViewHost* rvh,
// pages (unless it's specifically allowed).
if ((url.SchemeIs(chrome::kChromeUIScheme) ||
(url.SchemeIs(chrome::kAboutScheme) &&
- url.spec() != chrome::kAboutBlankURL)) &&
+ url.spec() != kAboutBlankURL)) &&
!command_line.HasSwitch(switches::kAllowWebUICompositing)) {
prefs.accelerated_compositing_enabled = false;
prefs.accelerated_2d_canvas_enabled = false;
@@ -1992,7 +1992,7 @@ int WebContentsImpl::DownloadImage(const GURL& url,
bool WebContentsImpl::FocusLocationBarByDefault() {
NavigationEntry* entry = controller_.GetActiveEntry();
- if (entry && entry->GetURL() == GURL(chrome::kAboutBlankURL))
+ if (entry && entry->GetURL() == GURL(kAboutBlankURL))
return true;
return delegate_ && delegate_->ShouldFocusLocationBarByDefault(this);
}
@@ -2009,7 +2009,7 @@ void WebContentsImpl::DidStartProvisionalLoadForFrame(
bool is_main_frame,
const GURL& url) {
bool is_error_page = (url.spec() == kUnreachableWebDataURL);
- bool is_iframe_srcdoc = (url.spec() == chrome::kAboutSrcDocURL);
+ bool is_iframe_srcdoc = (url.spec() == kAboutSrcDocURL);
GURL validated_url(url);
RenderProcessHost* render_process_host =
render_view_host->GetProcess();
@@ -2779,7 +2779,7 @@ void WebContentsImpl::DidNavigate(
// this is for about:blank. In that case, the SiteInstance can still be
// considered unused until a navigation to a real page.
if (!static_cast<SiteInstanceImpl*>(GetSiteInstance())->HasSite() &&
- params.url != GURL(chrome::kAboutBlankURL)) {
+ params.url != GURL(kAboutBlankURL)) {
static_cast<SiteInstanceImpl*>(GetSiteInstance())->SetSite(params.url);
}
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index 6d79088..70dcb07 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -297,8 +297,7 @@ TEST_F(WebContentsImplTest, UpdateTitle) {
NavigationControllerImpl& cont =
static_cast<NavigationControllerImpl&>(controller());
ViewHostMsg_FrameNavigate_Params params;
- InitNavigateParams(&params, 0, GURL(chrome::kAboutBlankURL),
- PAGE_TRANSITION_TYPED);
+ InitNavigateParams(&params, 0, GURL(kAboutBlankURL), PAGE_TRANSITION_TYPED);
LoadCommittedDetails details;
cont.RendererDidNavigate(params, &details);
@@ -1060,7 +1059,7 @@ TEST_F(WebContentsImplTest, NavigationEntryContentStateNewWindow) {
// When opening a new window, it is navigated to about:blank internally.
// Currently, this results in two DidNavigate events.
- const GURL url(chrome::kAboutBlankURL);
+ const GURL url(kAboutBlankURL);
contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);
contents()->TestDidNavigate(orig_rvh, 1, url, PAGE_TRANSITION_TYPED);
diff --git a/content/browser/webui/web_ui_controller_factory_registry.cc b/content/browser/webui/web_ui_controller_factory_registry.cc
index 5e7bd63..32220ac 100644
--- a/content/browser/webui/web_ui_controller_factory_registry.cc
+++ b/content/browser/webui/web_ui_controller_factory_registry.cc
@@ -85,7 +85,7 @@ bool WebUIControllerFactoryRegistry::IsURLAcceptableForWebUI(
url.SchemeIs(chrome::kJavaScriptScheme) ||
// It's possible to load about:blank in a Web UI renderer.
// See http://crbug.com/42547
- url.spec() == chrome::kAboutBlankURL ||
+ url.spec() == kAboutBlankURL ||
// Chrome URLs crash, kill, hang, and shorthang are allowed.
url == GURL(kChromeUICrashURL) ||
url == GURL(kChromeUIKillURL) ||
diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc
index 1a03fa5..1e91a16 100644
--- a/content/public/common/url_constants.cc
+++ b/content/public/common/url_constants.cc
@@ -30,13 +30,13 @@ const char kMetadataScheme[] = "metadata";
const char kSwappedOutScheme[] = "swappedout";
const char kViewSourceScheme[] = "view-source";
-const char kAboutBlankURL[] = "about:blank";
-const char kAboutSrcDocURL[] = "about:srcdoc";
-
} // namespace chrome
namespace content {
+const char kAboutBlankURL[] = "about:blank";
+const char kAboutSrcDocURL[] = "about:srcdoc";
+
const char kChromeUIAppCacheInternalsHost[] = "appcache-internals";
const char kChromeUIIndexedDBInternalsHost[] = "indexeddb-internals";
const char kChromeUIAccessibilityHost[] = "accessibility";
diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h
index 515a45f..967b10c 100644
--- a/content/public/common/url_constants.h
+++ b/content/public/common/url_constants.h
@@ -35,14 +35,14 @@ CONTENT_EXPORT extern const char kMetadataScheme[];
CONTENT_EXPORT extern const char kSwappedOutScheme[];
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 {
+// Hosts for about URLs.
+CONTENT_EXPORT extern const char kAboutBlankURL[];
+CONTENT_EXPORT extern const char kAboutSrcDocURL[];
+
CONTENT_EXPORT extern const char kChromeUIAccessibilityHost[];
CONTENT_EXPORT extern const char kChromeUIAppCacheInternalsHost[];
CONTENT_EXPORT extern const char kChromeUIBlobInternalsHost[];
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index cb6ab5c..5e33387 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -374,7 +374,7 @@ static RenderViewImpl* (*g_create_render_view_impl)(RenderViewImplParams*) =
static void GetRedirectChain(WebDataSource* ds, std::vector<GURL>* result) {
// Replace any occurrences of swappedout:// with about:blank.
- const WebURL& blank_url = GURL(chrome::kAboutBlankURL);
+ const WebURL& blank_url = GURL(kAboutBlankURL);
WebVector<WebURL> urls;
ds->redirectChain(urls);
result->reserve(urls.size());
@@ -3035,7 +3035,7 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
// (see below).
bool is_fork =
// Must start from a tab showing about:blank, which is later redirected.
- old_url == GURL(chrome::kAboutBlankURL) &&
+ old_url == GURL(kAboutBlankURL) &&
// Must be the first real navigation of the tab.
historyBackListCount() < 1 &&
historyForwardListCount() < 1 &&
@@ -3150,7 +3150,7 @@ void RenderViewImpl::willPerformClientRedirect(
WebFrame* frame, const WebURL& from, const WebURL& to, double interval,
double fire_time) {
// Replace any occurrences of swappedout:// with about:blank.
- const WebURL& blank_url = GURL(chrome::kAboutBlankURL);
+ const WebURL& blank_url = GURL(kAboutBlankURL);
FOR_EACH_OBSERVER(
RenderViewObserver, observers_,
@@ -3167,7 +3167,7 @@ void RenderViewImpl::didCancelClientRedirect(WebFrame* frame) {
void RenderViewImpl::didCompleteClientRedirect(
WebFrame* frame, const WebURL& from) {
// Replace any occurrences of swappedout:// with about:blank.
- const WebURL& blank_url = GURL(chrome::kAboutBlankURL);
+ const WebURL& blank_url = GURL(kAboutBlankURL);
if (!frame->parent()) {
WebDataSource* ds = frame->provisionalDataSource();
// If there's no provisional data source, it's a reference fragment
@@ -3649,7 +3649,7 @@ void RenderViewImpl::didClearWindowObject(WebFrame* frame) {
void RenderViewImpl::didCreateDocumentElement(WebFrame* frame) {
// Notify the browser about non-blank documents loading in the top frame.
GURL url = frame->document().url();
- if (url.is_valid() && url.spec() != chrome::kAboutBlankURL) {
+ if (url.is_valid() && url.spec() != kAboutBlankURL) {
if (frame == webview()->mainFrame())
Send(new ViewHostMsg_DocumentAvailableInMainFrame(routing_id_));
}
diff --git a/content/shell/shell_devtools_delegate.cc b/content/shell/shell_devtools_delegate.cc
index ae46298..210d646 100644
--- a/content/shell/shell_devtools_delegate.cc
+++ b/content/shell/shell_devtools_delegate.cc
@@ -90,7 +90,7 @@ std::string ShellDevToolsDelegate::GetPageThumbnailData(const GURL& url) {
RenderViewHost* ShellDevToolsDelegate::CreateNewTarget() {
Shell* shell = Shell::CreateNewWindow(browser_context_,
- GURL(chrome::kAboutBlankURL),
+ GURL(kAboutBlankURL),
NULL,
MSG_ROUTING_NONE,
gfx::Size());
diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc
index d6b7fd11..9ed527a 100644
--- a/content/test/content_browser_test.cc
+++ b/content/test/content_browser_test.cc
@@ -132,7 +132,7 @@ void ContentBrowserTest::RunTestOnMainThreadLoop() {
Shell* ContentBrowserTest::CreateBrowser() {
return Shell::CreateNewWindow(
ShellContentBrowserClient::Get()->browser_context(),
- GURL(chrome::kAboutBlankURL),
+ GURL(kAboutBlankURL),
NULL,
MSG_ROUTING_NONE,
gfx::Size());
@@ -141,7 +141,7 @@ Shell* ContentBrowserTest::CreateBrowser() {
Shell* ContentBrowserTest::CreateOffTheRecordBrowser() {
return Shell::CreateNewWindow(
ShellContentBrowserClient::Get()->off_the_record_browser_context(),
- GURL(chrome::kAboutBlankURL),
+ GURL(kAboutBlankURL),
NULL,
MSG_ROUTING_NONE,
gfx::Size());
generated by cgit v1.1 at 2025-03-28 08:56:27 +0000