diff options
Diffstat (limited to 'chrome/browser')
9 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/autocomplete/autocomplete_input.cc b/chrome/browser/autocomplete/autocomplete_input.cc index 5bb163c..aea5f7a 100644 --- a/chrome/browser/autocomplete/autocomplete_input.cc +++ b/chrome/browser/autocomplete/autocomplete_input.cc @@ -187,7 +187,7 @@ AutocompleteInput::Type AutocompleteInput::Parse( // we should still claim to handle them. if (LowerCaseEqualsASCII(parsed_scheme, content::kViewSourceScheme) || LowerCaseEqualsASCII(parsed_scheme, content::kJavaScriptScheme) || - LowerCaseEqualsASCII(parsed_scheme, chrome::kDataScheme)) + LowerCaseEqualsASCII(parsed_scheme, content::kDataScheme)) return URL; // Finally, check and see if the user has explicitly opened this scheme as diff --git a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc index a13dc26..b74cceb 100644 --- a/chrome/browser/browsing_data/browsing_data_helper_unittest.cc +++ b/chrome/browser/browsing_data/browsing_data_helper_unittest.cc @@ -61,7 +61,7 @@ TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreWebSafe) { EXPECT_TRUE(IsWebScheme(content::kHttpScheme)); EXPECT_TRUE(IsWebScheme(content::kHttpsScheme)); EXPECT_TRUE(IsWebScheme(content::kFtpScheme)); - EXPECT_TRUE(IsWebScheme(chrome::kDataScheme)); + EXPECT_TRUE(IsWebScheme(content::kDataScheme)); EXPECT_TRUE(IsWebScheme("feed")); EXPECT_TRUE(IsWebScheme(chrome::kBlobScheme)); EXPECT_TRUE(IsWebScheme(content::kFileSystemScheme)); @@ -84,7 +84,7 @@ TEST_F(BrowsingDataHelperTest, WebSafeSchemesAreNotExtensions) { EXPECT_FALSE(IsExtensionScheme(content::kHttpScheme)); EXPECT_FALSE(IsExtensionScheme(content::kHttpsScheme)); EXPECT_FALSE(IsExtensionScheme(content::kFtpScheme)); - EXPECT_FALSE(IsExtensionScheme(chrome::kDataScheme)); + EXPECT_FALSE(IsExtensionScheme(content::kDataScheme)); EXPECT_FALSE(IsExtensionScheme("feed")); EXPECT_FALSE(IsExtensionScheme(chrome::kBlobScheme)); EXPECT_FALSE(IsExtensionScheme(content::kFileSystemScheme)); diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index de05b83..a8a0eba 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -94,7 +94,7 @@ GURL GetImageURLFromData(std::string contents) { std::string contents_base64; base::Base64Encode(contents, &contents_base64); - // TODO(dvh): make use of chrome::kDataScheme. Filed as crbug/297301. + // TODO(dvh): make use of content::kDataScheme. Filed as crbug/297301. const char kDataURLPrefix[] = "data:image;base64,"; return GURL(kDataURLPrefix + contents_base64); } diff --git a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc index 54b8409..86aa198 100644 --- a/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc +++ b/chrome/browser/extensions/api/web_navigation/frame_navigation_state.cc @@ -20,7 +20,7 @@ const char* kValidSchemes[] = { content::kFileScheme, content::kFtpScheme, content::kJavaScriptScheme, - chrome::kDataScheme, + content::kDataScheme, content::kFileSystemScheme, }; diff --git a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc index d1d73b6..4156f98 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api_helpers.cc @@ -424,7 +424,7 @@ static bool MergeOnBeforeRequestResponsesHelper( if ((*delta)->new_url.is_empty()) continue; if (consider_only_cancel_scheme_urls && - !(*delta)->new_url.SchemeIs(chrome::kDataScheme) && + !(*delta)->new_url.SchemeIs(content::kDataScheme) && (*delta)->new_url.spec() != "about:blank") { continue; } diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 31ad820..314f965 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -644,7 +644,7 @@ void IOThread::InitAsync() { TRACE_EVENT_END0("startup", "IOThread::InitAsync:HttpNetworkSession"); scoped_ptr<net::URLRequestJobFactoryImpl> job_factory( new net::URLRequestJobFactoryImpl()); - job_factory->SetProtocolHandler(chrome::kDataScheme, + job_factory->SetProtocolHandler(content::kDataScheme, new net::DataProtocolHandler()); job_factory->SetProtocolHandler( content::kFileScheme, diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index e1e6092..8ab64e6 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -606,7 +606,7 @@ bool ProfileIOData::IsHandledProtocol(const std::string& scheme) { extensions::kExtensionScheme, extensions::kExtensionResourceScheme, chrome::kChromeUIScheme, - chrome::kDataScheme, + content::kDataScheme, #if defined(OS_CHROMEOS) chrome::kDriveScheme, #endif // defined(OS_CHROMEOS) @@ -1015,7 +1015,7 @@ scoped_ptr<net::URLRequestJobFactory> ProfileIOData::SetUpJobFactoryDefaults( CreateExtensionResourceProtocolHandler()); DCHECK(set_protocol); set_protocol = job_factory->SetProtocolHandler( - chrome::kDataScheme, new net::DataProtocolHandler()); + content::kDataScheme, new net::DataProtocolHandler()); DCHECK(set_protocol); #if defined(OS_CHROMEOS) if (!is_incognito() && profile_params_) { diff --git a/chrome/browser/search_engines/template_url_parser.cc b/chrome/browser/search_engines/template_url_parser.cc index 93d11de..7ccad03 100644 --- a/chrome/browser/search_engines/template_url_parser.cc +++ b/chrome/browser/search_engines/template_url_parser.cc @@ -246,7 +246,7 @@ void TemplateURLParsingContext::EndElementImpl(void* ctx, const xmlChar* name) { break; case TemplateURLParsingContext::IMAGE: { GURL image_url(base::UTF16ToUTF8(context->string_)); - if (image_url.SchemeIs(chrome::kDataScheme)) { + if (image_url.SchemeIs(content::kDataScheme)) { // TODO (jcampan): bug 1169256: when dealing with data URL, we need to // decode the data URL in the renderer. For now, we'll just point to the // favicon from the URL. diff --git a/chrome/browser/ui/views/toolbar/site_chip_view.cc b/chrome/browser/ui/views/toolbar/site_chip_view.cc index a411f3b..9124293 100644 --- a/chrome/browser/ui/views/toolbar/site_chip_view.cc +++ b/chrome/browser/ui/views/toolbar/site_chip_view.cc @@ -237,7 +237,7 @@ base::string16 SiteChipView::SiteLabelFromURL(const GURL& provided_url) { if (url.SchemeIs(chrome::kBlobScheme) || url.SchemeIs(chrome::kChromeDevToolsScheme) || url.SchemeIs(chrome::kChromeNativeScheme) || - url.SchemeIs(chrome::kDataScheme) || + url.SchemeIs(content::kDataScheme) || url.SchemeIs(content::kFileScheme) || url.SchemeIs(content::kFileSystemScheme) || url.SchemeIs(content::kGuestScheme) || |