summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/browser/browser_url_handler_impl.cc8
-rw-r--r--content/browser/child_process_security_policy_impl.cc10
-rw-r--r--content/browser/child_process_security_policy_unittest.cc2
-rw-r--r--content/browser/renderer_host/render_view_host_manager_browsertest.cc7
-rw-r--r--content/browser/web_contents/navigation_entry_impl.cc2
-rw-r--r--content/public/browser/web_contents_delegate.cc6
-rw-r--r--content/public/common/url_constants.cc4
-rw-r--r--content/public/common/url_constants.h4
-rw-r--r--content/renderer/render_view_impl.cc2
-rw-r--r--content/test/net/url_request_mock_http_job.cc2
10 files changed, 22 insertions, 25 deletions
diff --git a/content/browser/browser_url_handler_impl.cc b/content/browser/browser_url_handler_impl.cc
index 126e485..ba31124 100644
--- a/content/browser/browser_url_handler_impl.cc
+++ b/content/browser/browser_url_handler_impl.cc
@@ -15,7 +15,7 @@ namespace content {
// Handles rewriting view-source URLs for what we'll actually load.
static bool HandleViewSource(GURL* url,
BrowserContext* browser_context) {
- if (url->SchemeIs(chrome::kViewSourceScheme)) {
+ if (url->SchemeIs(kViewSourceScheme)) {
// Load the inner URL instead.
*url = GURL(url->path());
@@ -48,12 +48,12 @@ static bool HandleViewSource(GURL* url,
// Turns a non view-source URL into the corresponding view-source URL.
static bool ReverseViewSource(GURL* url, BrowserContext* browser_context) {
// No action necessary if the URL is already view-source:
- if (url->SchemeIs(chrome::kViewSourceScheme))
+ if (url->SchemeIs(kViewSourceScheme))
return false;
url_canon::Replacements<char> repl;
- repl.SetScheme(chrome::kViewSourceScheme,
- url_parse::Component(0, strlen(chrome::kViewSourceScheme)));
+ repl.SetScheme(kViewSourceScheme,
+ url_parse::Component(0, strlen(kViewSourceScheme)));
repl.SetPath(url->spec().c_str(),
url_parse::Component(0, url->spec().size()));
*url = url->ReplaceComponents(repl);
diff --git a/content/browser/child_process_security_policy_impl.cc b/content/browser/child_process_security_policy_impl.cc
index 89c8efe..6fed71f 100644
--- a/content/browser/child_process_security_policy_impl.cc
+++ b/content/browser/child_process_security_policy_impl.cc
@@ -270,7 +270,7 @@ ChildProcessSecurityPolicyImpl::ChildProcessSecurityPolicyImpl() {
// We know about the following pseudo schemes and treat them specially.
RegisterPseudoScheme(chrome::kAboutScheme);
RegisterPseudoScheme(chrome::kJavaScriptScheme);
- RegisterPseudoScheme(chrome::kViewSourceScheme);
+ RegisterPseudoScheme(kViewSourceScheme);
}
ChildProcessSecurityPolicyImpl::~ChildProcessSecurityPolicyImpl() {
@@ -369,7 +369,7 @@ void ChildProcessSecurityPolicyImpl::GrantRequestURL(
if (IsPseudoScheme(url.scheme())) {
// The view-source scheme is a special case of a pseudo-URL that eventually
// results in requesting its embedded URL.
- if (url.SchemeIs(chrome::kViewSourceScheme)) {
+ if (url.SchemeIs(kViewSourceScheme)) {
// URLs with the view-source scheme typically look like:
// view-source:http://www.google.com/a
// In order to request these URLs, the child_id needs to be able to
@@ -536,12 +536,12 @@ bool ChildProcessSecurityPolicyImpl::CanRequestURL(
if (IsPseudoScheme(url.scheme())) {
// There are a number of special cases for pseudo schemes.
- if (url.SchemeIs(chrome::kViewSourceScheme)) {
+ if (url.SchemeIs(kViewSourceScheme)) {
// A view-source URL is allowed if the child process is permitted to
// request the embedded URL. Careful to avoid pointless recursion.
GURL child_url(url.path());
- if (child_url.SchemeIs(chrome::kViewSourceScheme) &&
- url.SchemeIs(chrome::kViewSourceScheme))
+ if (child_url.SchemeIs(kViewSourceScheme) &&
+ url.SchemeIs(kViewSourceScheme))
return false;
return CanRequestURL(child_id, child_url);
diff --git a/content/browser/child_process_security_policy_unittest.cc b/content/browser/child_process_security_policy_unittest.cc
index e4c5f38..2bae39e 100644
--- a/content/browser/child_process_security_policy_unittest.cc
+++ b/content/browser/child_process_security_policy_unittest.cc
@@ -108,7 +108,7 @@ TEST_F(ChildProcessSecurityPolicyTest, IsPseudoSchemeTest) {
EXPECT_TRUE(p->IsPseudoScheme(chrome::kAboutScheme));
EXPECT_TRUE(p->IsPseudoScheme(chrome::kJavaScriptScheme));
- EXPECT_TRUE(p->IsPseudoScheme(chrome::kViewSourceScheme));
+ EXPECT_TRUE(p->IsPseudoScheme(kViewSourceScheme));
EXPECT_FALSE(p->IsPseudoScheme("registered-pseudo-scheme"));
p->RegisterPseudoScheme("registered-pseudo-scheme");
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 e94fa9a..edf39ea 100644
--- a/content/browser/renderer_host/render_view_host_manager_browsertest.cc
+++ b/content/browser/renderer_host/render_view_host_manager_browsertest.cc
@@ -1118,13 +1118,12 @@ IN_PROC_BROWSER_TEST_F(RenderViewHostManagerTest, LeakingRenderViewHosts) {
RenderViewHostObserverArray rvh_observers;
GURL navigated_url(test_server()->GetURL("files/title2.html"));
- GURL view_source_url(chrome::kViewSourceScheme + std::string(":") +
- navigated_url.spec());
+ GURL view_source_url(kViewSourceScheme + std::string(":") +
+ navigated_url.spec());
// Let's ensure that when we start with a blank window, navigating away to a
// view-source URL, we create a new SiteInstance.
- RenderViewHost* blank_rvh = shell()->web_contents()->
- GetRenderViewHost();
+ RenderViewHost* blank_rvh = shell()->web_contents()->GetRenderViewHost();
SiteInstance* blank_site_instance = blank_rvh->GetSiteInstance();
EXPECT_EQ(shell()->web_contents()->GetURL(), GURL::EmptyGURL());
EXPECT_EQ(blank_site_instance->GetSiteURL(), GURL::EmptyGURL());
diff --git a/content/browser/web_contents/navigation_entry_impl.cc b/content/browser/web_contents/navigation_entry_impl.cc
index 23c90e9..727092f 100644
--- a/content/browser/web_contents/navigation_entry_impl.cc
+++ b/content/browser/web_contents/navigation_entry_impl.cc
@@ -194,7 +194,7 @@ const string16& NavigationEntryImpl::GetTitleForDisplay(
}
bool NavigationEntryImpl::IsViewSourceMode() const {
- return virtual_url_.SchemeIs(chrome::kViewSourceScheme);
+ return virtual_url_.SchemeIs(kViewSourceScheme);
}
void NavigationEntryImpl::SetTransitionType(
diff --git a/content/public/browser/web_contents_delegate.cc b/content/public/browser/web_contents_delegate.cc
index 6150861..6026328 100644
--- a/content/public/browser/web_contents_delegate.cc
+++ b/content/public/browser/web_contents_delegate.cc
@@ -87,8 +87,7 @@ void WebContentsDelegate::ViewSourceForTab(WebContents* source,
// Fall back implementation based entirely on the view-source scheme.
// It suffers from http://crbug.com/523 and that is why browser overrides
// it with proper implementation.
- GURL url = GURL(chrome::kViewSourceScheme + std::string(":") +
- page_url.spec());
+ GURL url = GURL(kViewSourceScheme + std::string(":") + page_url.spec());
OpenURLFromTab(source, OpenURLParams(url, Referrer(),
NEW_FOREGROUND_TAB,
PAGE_TRANSITION_LINK, false));
@@ -98,8 +97,7 @@ void WebContentsDelegate::ViewSourceForFrame(WebContents* source,
const GURL& frame_url,
const PageState& page_state) {
// Same as ViewSourceForTab, but for given subframe.
- GURL url = GURL(chrome::kViewSourceScheme + std::string(":") +
- frame_url.spec());
+ GURL url = GURL(kViewSourceScheme + std::string(":") + frame_url.spec());
OpenURLFromTab(source, OpenURLParams(url, Referrer(),
NEW_FOREGROUND_TAB,
PAGE_TRANSITION_LINK, false));
diff --git a/content/public/common/url_constants.cc b/content/public/common/url_constants.cc
index 1f458e6f..7cec38a 100644
--- a/content/public/common/url_constants.cc
+++ b/content/public/common/url_constants.cc
@@ -25,12 +25,12 @@ const char kJavaScriptScheme[] = "javascript";
const char kMailToScheme[] = "mailto";
const char kMetadataScheme[] = "metadata";
const char kSwappedOutScheme[] = "swappedout";
-const char kViewSourceScheme[] = "view-source";
-
} // namespace chrome
namespace content {
+const char kViewSourceScheme[] = "view-source";
+
const char kAboutBlankURL[] = "about:blank";
const char kAboutSrcDocURL[] = "about:srcdoc";
diff --git a/content/public/common/url_constants.h b/content/public/common/url_constants.h
index e6ca477..58ee895 100644
--- a/content/public/common/url_constants.h
+++ b/content/public/common/url_constants.h
@@ -31,12 +31,12 @@ CONTENT_EXPORT extern const char kJavaScriptScheme[];
CONTENT_EXPORT extern const char kMailToScheme[];
CONTENT_EXPORT extern const char kMetadataScheme[];
CONTENT_EXPORT extern const char kSwappedOutScheme[];
-CONTENT_EXPORT extern const char kViewSourceScheme[];
-
} // namespace chrome
namespace content {
+CONTENT_EXPORT extern const char kViewSourceScheme[];
+
// Hosts for about URLs.
CONTENT_EXPORT extern const char kAboutBlankURL[];
CONTENT_EXPORT extern const char kAboutSrcDocURL[];
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index e882364..3b503e1 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -3009,7 +3009,7 @@ WebNavigationPolicy RenderViewImpl::decidePolicyForNavigation(
bool is_initial_navigation = page_id_ == -1;
bool should_fork = HasWebUIScheme(url) || HasWebUIScheme(old_url) ||
(cumulative_bindings & BINDINGS_POLICY_WEB_UI) ||
- url.SchemeIs(chrome::kViewSourceScheme) ||
+ url.SchemeIs(kViewSourceScheme) ||
(frame->isViewSourceModeEnabled() &&
type != WebKit::WebNavigationTypeReload);
diff --git a/content/test/net/url_request_mock_http_job.cc b/content/test/net/url_request_mock_http_job.cc
index 404882c..f36cdf1 100644
--- a/content/test/net/url_request_mock_http_job.cc
+++ b/content/test/net/url_request_mock_http_job.cc
@@ -95,7 +95,7 @@ GURL URLRequestMockHTTPJob::GetMockUrl(const base::FilePath& path) {
// static
GURL URLRequestMockHTTPJob::GetMockViewSourceUrl(const base::FilePath& path) {
- std::string url = chrome::kViewSourceScheme;
+ std::string url = kViewSourceScheme;
url.append(":");
url.append(GetMockUrl(path).spec());
return GURL(url);
generated by cgit v1.1 at 2025-05-29 07:55:54 +0000