summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/autocomplete/autocomplete_input.cc4
-rw-r--r--chrome/browser/autocomplete/autocomplete_provider.cc2
-rw-r--r--chrome/browser/browsing_data/browsing_data_helper_unittest.cc4
-rw-r--r--chrome/browser/history/history_service.cc2
-rw-r--r--chrome/browser/net/url_fixer_upper.cc6
-rw-r--r--chrome/browser/tab_contents/view_source_browsertest.cc16
-rw-r--r--chrome/browser/ui/browser_command_controller.cc2
-rw-r--r--chrome/browser/ui/browser_commands.cc4
-rw-r--r--chrome/browser/ui/browser_navigator.cc6
-rw-r--r--chrome/browser/ui/browser_navigator_browsertest.cc6
-rw-r--r--chrome/browser/ui/cocoa/applescript/tab_applescript.mm14
-rw-r--r--chrome/browser/ui/singleton_tabs.cc2
12 files changed, 34 insertions, 34 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;
generated by cgit v1.1 at 2025-05-30 04:40:26 +0000