diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-30 06:32:11 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-30 06:32:11 +0000 |
| commit | 3e99baf3de4049c43729d87081b4600753d977fe (patch) | |
| tree | 0965c35203ca313438a728405d59e775810b0e1f /android_webview | |
| parent | a9397d683bdd0e2509462ad9688ca577178d3f7e (diff) | |
| download | chromium_src-3e99baf3de4049c43729d87081b4600753d977fe.zip chromium_src-3e99baf3de4049c43729d87081b4600753d977fe.tar.gz chromium_src-3e99baf3de4049c43729d87081b4600753d977fe.tar.bz2 | |
Move kFileScheme constant into content namespace.
BUG=None
TEST=None, no functional changes
TBR=jam@chromium.org
Review URL: https://codereview.chromium.org/120593003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242712 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
4 files changed, 5 insertions, 5 deletions
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc index 3502bc9..9bbd2b6 100644 --- a/android_webview/browser/aw_content_browser_client.cc +++ b/android_webview/browser/aw_content_browser_client.cc @@ -194,7 +194,7 @@ void AwContentBrowserClient::RenderProcessWillLaunch( content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme( host->GetID(), android_webview::kContentScheme); content::ChildProcessSecurityPolicy::GetInstance()->GrantScheme( - host->GetID(), chrome::kFileScheme); + host->GetID(), content::kFileScheme); host->AddFilter(new AwContentsMessageFilter(host->GetID())); } diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc index 79b84da..35793cf 100644 --- a/android_webview/browser/net/aw_url_request_context_getter.cc +++ b/android_webview/browser/net/aw_url_request_context_getter.cc @@ -92,7 +92,7 @@ scoped_ptr<net::URLRequestJobFactory> CreateJobFactory( content::ProtocolHandlerMap* protocol_handlers) { scoped_ptr<AwURLRequestJobFactory> aw_job_factory(new AwURLRequestJobFactory); bool set_protocol = aw_job_factory->SetProtocolHandler( - chrome::kFileScheme, + content::kFileScheme, new net::FileProtocolHandler( content::BrowserThread::GetBlockingPool()-> GetTaskRunnerWithShutdownBehavior( diff --git a/android_webview/native/android_protocol_handler.cc b/android_webview/native/android_protocol_handler.cc index 407f62f..e94c558 100644 --- a/android_webview/native/android_protocol_handler.cc +++ b/android_webview/native/android_protocol_handler.cc @@ -229,10 +229,10 @@ net::URLRequestJob* AndroidProtocolHandlerBase::MaybeCreateJob( // AssetFileProtocolHandler --------------------------------------------------- AssetFileProtocolHandler::AssetFileProtocolHandler() - : asset_prefix_(std::string(chrome::kFileScheme) + + : asset_prefix_(std::string(content::kFileScheme) + std::string(content::kStandardSchemeSeparator) + android_webview::kAndroidAssetPath), - resource_prefix_(std::string(chrome::kFileScheme) + + resource_prefix_(std::string(content::kFileScheme) + std::string(content::kStandardSchemeSeparator) + android_webview::kAndroidResourcePath) { } diff --git a/android_webview/native/cookie_manager.cc b/android_webview/native/cookie_manager.cc index a0f01f2..4e16a9f 100644 --- a/android_webview/native/cookie_manager.cc +++ b/android_webview/native/cookie_manager.cc @@ -420,7 +420,7 @@ bool CookieManager::AllowFileSchemeCookies() { } bool CookieManager::AllowFileSchemeCookiesLocked() { - return cookie_monster_->IsCookieableScheme(chrome::kFileScheme); + return cookie_monster_->IsCookieableScheme(content::kFileScheme); } void CookieManager::SetAcceptFileSchemeCookies(bool accept) { |