diff options
29 files changed, 65 insertions, 68 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_input.cc b/chrome/browser/autocomplete/autocomplete_input.cc index 06ac18a..304f058 100644 --- a/chrome/browser/autocomplete/autocomplete_input.cc +++ b/chrome/browser/autocomplete/autocomplete_input.cc @@ -178,7 +178,7 @@ AutocompleteInput::Type AutocompleteInput::Parse( // reach the renderer or else the renderer handles internally without // reaching the net::URLRequest logic. We thus won't catch these above, but // we should still claim to handle them. - if (LowerCaseEqualsASCII(parsed_scheme, chrome::kViewSourceScheme) || + if (LowerCaseEqualsASCII(parsed_scheme, content::kViewSourceScheme) || LowerCaseEqualsASCII(parsed_scheme, chrome::kJavaScriptScheme) || LowerCaseEqualsASCII(parsed_scheme, chrome::kDataScheme)) return URL; @@ -431,7 +431,7 @@ void AutocompleteInput::ParseForEmphasizeComponents( int after_scheme_and_colon = parts.scheme.end() + 1; // For the view-source scheme, we should emphasize the scheme and host of the // URL qualified by the view-source prefix. - if (LowerCaseEqualsASCII(scheme_str, chrome::kViewSourceScheme) && + if (LowerCaseEqualsASCII(scheme_str, content::kViewSourceScheme) && (static_cast<int>(text.length()) > after_scheme_and_colon)) { // Obtain the URL prefixed by view-source and parse it. string16 real_url(text.substr(after_scheme_and_colon)); diff --git a/chrome/browser/autocomplete/autocomplete_provider.cc b/chrome/browser/autocomplete/autocomplete_provider.cc index 98904cb0..cbd1d60 100644 --- a/chrome/browser/autocomplete/autocomplete_provider.cc +++ b/chrome/browser/autocomplete/autocomplete_provider.cc @@ -130,7 +130,7 @@ AutocompleteProvider::~AutocompleteProvider() { bool AutocompleteProvider::HasHTTPScheme(const string16& input) { std::string utf8_input(UTF16ToUTF8(input)); url_parse::Component scheme; - if (url_util::FindAndCompareScheme(utf8_input, chrome::kViewSourceScheme, + if (url_util::FindAndCompareScheme(utf8_input, content::kViewSourceScheme, &scheme)) utf8_input.erase(0, scheme.end() + 1); return url_util::FindAndCompareScheme(utf8_input, chrome::kHttpScheme, NULL); diff --git a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc index c9bd5f2..8ce8867 100644 --- a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc @@ -83,7 +83,7 @@ TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotWebSafe) { EXPECT_FALSE(IsWebScheme(chrome::kMailToScheme)); EXPECT_FALSE(IsWebScheme(chrome::kMetadataScheme)); EXPECT_FALSE(IsWebScheme(chrome::kSwappedOutScheme)); - EXPECT_FALSE(IsWebScheme(chrome::kViewSourceScheme)); + EXPECT_FALSE(IsWebScheme(content::kViewSourceScheme)); } TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreNotExtensions) { @@ -108,7 +108,7 @@ TEST_F(BrowsingDataHelperTest, ChromeSchemesAreNotAllExtension) { EXPECT_FALSE(IsExtensionScheme(chrome::kMailToScheme)); EXPECT_FALSE(IsExtensionScheme(chrome::kMetadataScheme)); EXPECT_FALSE(IsExtensionScheme(chrome::kSwappedOutScheme)); - EXPECT_FALSE(IsExtensionScheme(chrome::kViewSourceScheme)); + EXPECT_FALSE(IsExtensionScheme(content::kViewSourceScheme)); } TEST_F(BrowsingDataHelperTest, TestMatches) { diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc index 61b7858..6ef94f9 100644 --- a/chrome/browser/history/history_service.cc +++ b/chrome/browser/history/history_service.cc @@ -1003,7 +1003,7 @@ bool HistoryService::CanAddURL(const GURL& url) { if (url.SchemeIs(chrome::kJavaScriptScheme) || url.SchemeIs(chrome::kChromeDevToolsScheme) || url.SchemeIs(chrome::kChromeUIScheme) || - url.SchemeIs(chrome::kViewSourceScheme) || + url.SchemeIs(content::kViewSourceScheme) || url.SchemeIs(chrome::kChromeInternalScheme)) return false; diff --git a/chrome/browser/net/url_fixer_upper.cc b/chrome/browser/net/url_fixer_upper.cc index 63c6c53..c16268a 100644 --- a/chrome/browser/net/url_fixer_upper.cc +++ b/chrome/browser/net/url_fixer_upper.cc @@ -505,11 +505,11 @@ GURL URLFixerUpper::FixupURL(const std::string& text, // For view-source: URLs, we strip "view-source:", do fixup, and stick it back // on. This allows us to handle things like "view-source:google.com". - if (scheme == chrome::kViewSourceScheme) { + if (scheme == content::kViewSourceScheme) { // Reject "view-source:view-source:..." to avoid deep recursion. - std::string view_source(chrome::kViewSourceScheme + std::string(":")); + std::string view_source(content::kViewSourceScheme + std::string(":")); if (!StartsWithASCII(text, view_source + view_source, false)) { - return GURL(chrome::kViewSourceScheme + std::string(":") + + return GURL(content::kViewSourceScheme + std::string(":") + FixupURL(trimmed.substr(scheme.length() + 1), desired_tld).possibly_invalid_spec()); } diff --git a/chrome/browser/tab_contents/view_source_browsertest.cc b/chrome/browser/tab_contents/view_source_browsertest.cc index dbb2e61..63a6629 100644 --- a/chrome/browser/tab_contents/view_source_browsertest.cc +++ b/chrome/browser/tab_contents/view_source_browsertest.cc @@ -34,8 +34,8 @@ IN_PROC_BROWSER_TEST_F(ViewSourceTest, DoesBrowserRenderInViewSource) { ASSERT_TRUE(test_server()->Start()); // First we navigate to our view-source test page. - GURL url(chrome::kViewSourceScheme + std::string(":") + - test_server()->GetURL(kTestHtml).spec()); + GURL url(content::kViewSourceScheme + std::string(":") + + test_server()->GetURL(kTestHtml).spec()); ui_test_utils::NavigateToURL(browser(), url); // Check that the title didn't get set. It should not be there (because we @@ -56,8 +56,8 @@ IN_PROC_BROWSER_TEST_F(ViewSourceTest, DoesBrowserConsumeViewSourcePrefix) { ui_test_utils::NavigateToURL(browser(), url); // Then we navigate to the same url but with the "view-source:" prefix. - GURL url_viewsource(chrome::kViewSourceScheme + std::string(":") + - url.spec()); + GURL url_viewsource(content::kViewSourceScheme + std::string(":") + + url.spec()); ui_test_utils::NavigateToURL(browser(), url_viewsource); // The URL should still be prefixed with "view-source:". @@ -98,8 +98,8 @@ IN_PROC_BROWSER_TEST_F(ViewSourceTest, ViewSourceInMenuDisabledWhileViewingSource) { ASSERT_TRUE(test_server()->Start()); - GURL url_viewsource(chrome::kViewSourceScheme + std::string(":") + - test_server()->GetURL(kTestHtml).spec()); + GURL url_viewsource(content::kViewSourceScheme + std::string(":") + + test_server()->GetURL(kTestHtml).spec()); ui_test_utils::NavigateToURL(browser(), url_viewsource); EXPECT_FALSE(chrome::CanViewSource(browser())); @@ -111,8 +111,8 @@ IN_PROC_BROWSER_TEST_F(ViewSourceTest, IN_PROC_BROWSER_TEST_F(ViewSourceTest, DISABLED_TestViewSourceReload) { ASSERT_TRUE(test_server()->Start()); - GURL url_viewsource(chrome::kViewSourceScheme + std::string(":") + - test_server()->GetURL(kTestHtml).spec()); + GURL url_viewsource(content::kViewSourceScheme + std::string(":") + + test_server()->GetURL(kTestHtml).spec()); content::WindowedNotificationObserver observer( content::NOTIFICATION_LOAD_STOP, diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc index b5dc24d..3579b2b 100644 --- a/chrome/browser/ui/browser_command_controller.cc +++ b/chrome/browser/ui/browser_command_controller.cc @@ -71,7 +71,7 @@ bool HasInternalURL(const NavigationEntry* entry) { // If the |virtual_url()| isn't a chrome:// URL, check if it's actually // view-source: of a chrome:// URL. - if (entry->GetVirtualURL().SchemeIs(chrome::kViewSourceScheme)) + if (entry->GetVirtualURL().SchemeIs(content::kViewSourceScheme)) return entry->GetURL().SchemeIs(chrome::kChromeUIScheme); return false; diff --git a/chrome/browser/ui/browser_commands.cc b/chrome/browser/ui/browser_commands.cc index fd1c0ad..ee92200 100644 --- a/chrome/browser/ui/browser_commands.cc +++ b/chrome/browser/ui/browser_commands.cc @@ -1014,8 +1014,8 @@ void ViewSource(Browser* browser, if (!active_entry) return; - GURL view_source_url = GURL(kViewSourceScheme + std::string(":") + - url.spec()); + GURL view_source_url = + GURL(content::kViewSourceScheme + std::string(":") + url.spec()); active_entry->SetVirtualURL(view_source_url); // Do not restore scroller position. diff --git a/chrome/browser/ui/browser_navigator.cc b/chrome/browser/ui/browser_navigator.cc index d9ed0d3..4c6b399 100644 --- a/chrome/browser/ui/browser_navigator.cc +++ b/chrome/browser/ui/browser_navigator.cc @@ -640,13 +640,13 @@ void Navigate(NavigateParams* params) { bool IsURLAllowedInIncognito(const GURL& url, content::BrowserContext* browser_context) { - if (url.scheme() == chrome::kViewSourceScheme) { + if (url.scheme() == content::kViewSourceScheme) { // A view-source URL is allowed in incognito mode only if the URL itself // is allowed in incognito mode. Remove the "view-source:" from the start // of the URL and validate the rest. std::string stripped_spec = url.spec(); - DCHECK_GT(stripped_spec.size(), strlen(kViewSourceScheme)); - stripped_spec.erase(0, strlen(kViewSourceScheme)+1); + DCHECK_GT(stripped_spec.size(), strlen(content::kViewSourceScheme)); + stripped_spec.erase(0, strlen(content::kViewSourceScheme) + 1); GURL stripped_url(stripped_spec); return stripped_url.is_valid() && IsURLAllowedInIncognito(stripped_url, browser_context); diff --git a/chrome/browser/ui/browser_navigator_browsertest.cc b/chrome/browser/ui/browser_navigator_browsertest.cc index 588b09e..6d8ddcc 100644 --- a/chrome/browser/ui/browser_navigator_browsertest.cc +++ b/chrome/browser/ui/browser_navigator_browsertest.cc @@ -926,7 +926,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, IN_PROC_BROWSER_TEST_F( BrowserNavigatorTest, Disposition_ViewSource_Settings_DoNothingIfIncognitoForced) { - std::string view_source(chrome::kViewSourceScheme); + std::string view_source(content::kViewSourceScheme); view_source.append(":"); view_source.append(chrome::kChromeUISettingsURL); RunDoNothingIfIncognitoIsForcedTest(GURL(view_source)); @@ -937,7 +937,7 @@ IN_PROC_BROWSER_TEST_F( // case). IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, Disposition_ViewSource_Settings_UseNonIncognitoWindow) { - std::string view_source(chrome::kViewSourceScheme); + std::string view_source(content::kViewSourceScheme); view_source.append(":"); view_source.append(chrome::kChromeUISettingsURL); RunUseNonIncognitoWindowTest(GURL(view_source)); @@ -1290,7 +1290,7 @@ IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest, ViewSourceIsntSingleton) { const std::string viewsource_ntp_url = - std::string(chrome::kViewSourceScheme) + ":" + + std::string(content::kViewSourceScheme) + ":" + chrome::kChromeUIVersionURL; chrome::NavigateParams viewsource_params(browser(), diff --git a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm index 0219701..7fc426f 100644 --- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/tab_applescript.mm @@ -304,13 +304,13 @@ void ResumeAppleEventAndSendReply(NSAppleEventManagerSuspensionID suspension_id, NavigationEntry* entry = webContents_->GetController().GetLastCommittedEntry(); if (entry) { - webContents_->OpenURL(OpenURLParams( - GURL(chrome::kViewSourceScheme + std::string(":") + - entry->GetURL().spec()), - Referrer(), - NEW_FOREGROUND_TAB, - content::PAGE_TRANSITION_LINK, - false)); + webContents_->OpenURL( + OpenURLParams(GURL(content::kViewSourceScheme + std::string(":") + + entry->GetURL().spec()), + Referrer(), + NEW_FOREGROUND_TAB, + content::PAGE_TRANSITION_LINK, + false)); } } diff --git a/chrome/browser/ui/singleton_tabs.cc b/chrome/browser/ui/singleton_tabs.cc index 6515cbe..10648de 100644 --- a/chrome/browser/ui/singleton_tabs.cc +++ b/chrome/browser/ui/singleton_tabs.cc @@ -97,7 +97,7 @@ int GetIndexOfSingletonTab(NavigateParams* params) { // Skip view-source tabs. This is needed because RewriteURLIfNecessary // removes the "view-source:" scheme which leads to incorrect matching. - if (tab_url.SchemeIs(chrome::kViewSourceScheme)) + if (tab_url.SchemeIs(content::kViewSourceScheme)) continue; GURL rewritten_tab_url = tab_url; diff --git a/chrome/renderer/extensions/user_script_slave.cc b/chrome/renderer/extensions/user_script_slave.cc index 9a880f5..146b9c0 100644 --- a/chrome/renderer/extensions/user_script_slave.cc +++ b/chrome/renderer/extensions/user_script_slave.cc @@ -264,7 +264,7 @@ void UserScriptSlave::InjectScripts(WebFrame* frame, return; if (frame->isViewSourceModeEnabled()) - data_source_url = GURL(chrome::kViewSourceScheme + std::string(":") + + data_source_url = GURL(content::kViewSourceScheme + std::string(":") + data_source_url.spec()); PerfTimer timer; diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index 699e653..c1736fd 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -271,7 +271,7 @@ STDMETHODIMP ChromeActiveDocument::Load(BOOL fully_avalable, // For gcf: URLs allow only about and view-source schemes to pass through for // further inspection. bool is_safe_scheme = cf_url.gurl().SchemeIs(chrome::kAboutScheme) || - cf_url.gurl().SchemeIs(chrome::kViewSourceScheme); + cf_url.gurl().SchemeIs(content::kViewSourceScheme); if (cf_url.is_chrome_protocol() && !is_safe_scheme && !GetConfigBool(false, kAllowUnsafeURLs)) { DLOG(ERROR) << __FUNCTION__ << " gcf: not allowed:" << url; @@ -872,7 +872,7 @@ void ChromeActiveDocument::OnFindInPage() { void ChromeActiveDocument::OnViewSource() { DCHECK(navigation_info_->url.is_valid()); - HostNavigate(GURL(chrome::kViewSourceScheme + std::string(":") + + HostNavigate(GURL(content::kViewSourceScheme + std::string(":") + navigation_info_->url.spec()), GURL(), NEW_WINDOW); } diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h index 057b3e5..dc749a5 100644 --- a/chrome_frame/chrome_frame_activex_base.h +++ b/chrome_frame/chrome_frame_activex_base.h @@ -1076,7 +1076,7 @@ END_MSG_MAP() // using chrome frame full tab mode by using 'cf:' protocol handler. // Also change the disposition to NEW_WINDOW since IE6 doesn't have tabs. if (url_to_open.has_scheme() && - (url_to_open.SchemeIs(chrome::kViewSourceScheme) || + (url_to_open.SchemeIs(content::kViewSourceScheme) || url_to_open.SchemeIs(chrome::kAboutScheme))) { std::wstring chrome_url; chrome_url.append(kChromeProtocolPrefix); diff --git a/chrome_frame/navigation_constraints.cc b/chrome_frame/navigation_constraints.cc index 9b0bc71..95586a6 100644 --- a/chrome_frame/navigation_constraints.cc +++ b/chrome_frame/navigation_constraints.cc @@ -32,7 +32,7 @@ bool NavigationConstraintsImpl::IsSchemeAllowed(const GURL& url) { // Additional checking for view-source. Allow only http and https // URLs in view source. - if (url.SchemeIs(chrome::kViewSourceScheme)) { + if (url.SchemeIs(content::kViewSourceScheme)) { GURL sub_url(url.path()); if (sub_url.SchemeIs(chrome::kHttpScheme) || sub_url.SchemeIs(chrome::kHttpsScheme)) diff --git a/chrome_frame/test/ui_test.cc b/chrome_frame/test/ui_test.cc index 4cf769a..8f168ca 100644 --- a/chrome_frame/test/ui_test.cc +++ b/chrome_frame/test/ui_test.cc @@ -322,7 +322,7 @@ TEST_P(FullTabUITest, ViewSource) { // Expect notification for view-source window, handle new window event // and attach a new ie_mock_ to the received web browser std::wstring view_source_url; - view_source_url += UTF8ToWide(chrome::kViewSourceScheme); + view_source_url += UTF8ToWide(content::kViewSourceScheme); view_source_url += L":"; view_source_url += GetSimplePageUrl(); std::wstring url_in_new_window = kChromeProtocolPrefix; @@ -565,7 +565,7 @@ TEST_F(ContextMenuTest, CFViewSource) { // Expect notification for view-source window, handle new window event // and attach a new ie_mock_ to the received web browser std::wstring view_source_url; - view_source_url += UTF8ToWide(chrome::kViewSourceScheme); + view_source_url += UTF8ToWide(content::kViewSourceScheme); view_source_url += L":"; view_source_url += GetSimplePageUrl(); std::wstring url_in_new_window = kChromeProtocolPrefix; diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index d3aeea9..2b6525b 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -964,7 +964,7 @@ bool IsValidUrlScheme(const GURL& url, bool is_privileged) { // Additional checking for view-source. Allow only http and https // URLs in view source. - if (url.SchemeIs(chrome::kViewSourceScheme)) { + if (url.SchemeIs(content::kViewSourceScheme)) { GURL sub_url(url.path()); if (sub_url.SchemeIs(chrome::kHttpScheme) || sub_url.SchemeIs(chrome::kHttpsScheme)) 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); diff --git a/net/base/net_util.cc b/net/base/net_util.cc index 3d4924a..c5f5673 100644 --- a/net/base/net_util.cc +++ b/net/base/net_util.cc @@ -1545,7 +1545,7 @@ base::string16 FormatUrlWithOffsets( if (offsets_for_adjustment) original_offsets = *offsets_for_adjustment; - // Special handling for view-source:. Don't use chrome::kViewSourceScheme + // Special handling for view-source:. Don't use content::kViewSourceScheme // because this library shouldn't depend on chrome. const char* const kViewSource = "view-source"; // Reject "view-source:view-source:..." to avoid deep recursion. |