summaryrefslogtreecommitdiffstats
path: root/android_webview
diff options
context:
space:
mode:
authorblundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-05 09:44:24 +0000
committerblundell@chromium.org <blundell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-06-05 09:44:24 +0000
commitfb4fe095b612f8039e63c62cc87bfeacb5966cde (patch)
treed8ffb6f6d0dcd0710c18535cb3bba7422fe43ca2 /android_webview
parent46e8bf650a4625a34a7b5ba76db7c3716f1a2f1d (diff)
downloadchromium_src-fb4fe095b612f8039e63c62cc87bfeacb5966cde.zip
chromium_src-fb4fe095b612f8039e63c62cc87bfeacb5966cde.tar.gz
chromium_src-fb4fe095b612f8039e63c62cc87bfeacb5966cde.tar.bz2
Move kStandardSchemeSeparator from //content to //url
This constant is used in code shared by iOS, and is general enough to be placed in //url. TBR=benm,yoz Review URL: https://codereview.chromium.org/319613002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@275055 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'android_webview')
-rw-r--r--android_webview/native/android_protocol_handler.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/android_webview/native/android_protocol_handler.cc b/android_webview/native/android_protocol_handler.cc
index 1c0c922..ac57ae9 100644
--- a/android_webview/native/android_protocol_handler.cc
+++ b/android_webview/native/android_protocol_handler.cc
@@ -232,10 +232,10 @@ net::URLRequestJob* AndroidRequestInterceptorBase::MaybeInterceptRequest(
AssetFileRequestInterceptor::AssetFileRequestInterceptor()
: asset_prefix_(std::string(url::kFileScheme) +
- std::string(content::kStandardSchemeSeparator) +
+ std::string(url::kStandardSchemeSeparator) +
android_webview::kAndroidAssetPath),
resource_prefix_(std::string(url::kFileScheme) +
- std::string(content::kStandardSchemeSeparator) +
+ std::string(url::kStandardSchemeSeparator) +
android_webview::kAndroidResourcePath) {
}