diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-10 12:33:21 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-10 12:33:21 +0000 |
| commit | 8b20fdc5f2e2e21ae26b0345e0523ea3f1af91ad (patch) | |
| tree | a29a720d6b9c5ad2957119e536a5087c4029e482 | |
| parent | c535bf0b82947b8b1df6cef57c4465a1c6487015 (diff) | |
| download | chromium_src-8b20fdc5f2e2e21ae26b0345e0523ea3f1af91ad.zip chromium_src-8b20fdc5f2e2e21ae26b0345e0523ea3f1af91ad.tar.gz chromium_src-8b20fdc5f2e2e21ae26b0345e0523ea3f1af91ad.tar.bz2 | |
Translate: Don't use custom CSS and JavaScript loader on iOS
Custom JavaScript loader doesn't work on iOS because an origin check
fails outside v8 isolated world. Chrome should not overwrite these
callbacks on iOS.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/23715006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222254 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/translate/translate_script.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/translate/translate_script.cc b/chrome/browser/translate/translate_script.cc index 2f1d681..08be4cd 100644 --- a/chrome/browser/translate/translate_script.cc +++ b/chrome/browser/translate/translate_script.cc @@ -88,6 +88,8 @@ void TranslateScript::Request(const Callback& callback) { translate_script_url, kAlwaysUseSslQueryName, kAlwaysUseSslQueryValue); +#if !defined(OS_IOS) + // iOS doesn't need to use specific loaders for the isolated world. translate_script_url = net::AppendQueryParameter( translate_script_url, kCssLoaderCallbackQueryName, @@ -96,6 +98,7 @@ void TranslateScript::Request(const Callback& callback) { translate_script_url, kJavascriptLoaderCallbackQueryName, kJavascriptLoaderCallbackQueryValue); +#endif // !defined(OS_IOS) translate_script_url = TranslateURLUtil::AddHostLocaleToUrl(translate_script_url); |