diff options
| author | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 23:46:59 +0000 |
|---|---|---|
| committer | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 23:46:59 +0000 |
| commit | f2fd5112c062a8afbf1eca495b2beab4070bc8be (patch) | |
| tree | cb456815b9176224a0038be25ad0d37bbaeb5bc7 /chrome | |
| parent | e94ab7488408bc9d761069dca502a4a14b284713 (diff) | |
| download | chromium_src-f2fd5112c062a8afbf1eca495b2beab4070bc8be.zip chromium_src-f2fd5112c062a8afbf1eca495b2beab4070bc8be.tar.gz chromium_src-f2fd5112c062a8afbf1eca495b2beab4070bc8be.tar.bz2 | |
Merge 120113 - When translating a page, get the code and translation via HTTPS.
For some reason, the error reporting page doesn't work over HTTPS yet.
That's a separate bug, and when it is fixed we'll fix the last http: URL in
this file.
BUG=112236
TEST=browser_tests: TranslateManagerTest.*; translation still works, and reporting a translation error still works
Review URL: http://codereview.chromium.org/9320015
TBR=palmer@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9364001
git-svn-id: svn://svn.chromium.org/chrome/branches/1025/src@120863 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/translate/translate_manager.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc index 978fcf84..a22b603 100644 --- a/chrome/browser/translate/translate_manager.cc +++ b/chrome/browser/translate/translate_manager.cc @@ -150,14 +150,15 @@ const LanguageCodeSynonym kLanguageCodeSynonyms[] = { }; const char* const kTranslateScriptURL = - "http://translate.google.com/translate_a/element.js?" + "https://translate.google.com/translate_a/element.js?" "cb=cr.googleTranslate.onTranslateElementLoad"; const char* const kTranslateScriptHeader = "Google-Translate-Element-Mode: library"; const char* const kReportLanguageDetectionErrorURL = + // TODO(palmer): bug 112236. Make this https://. "http://translate.google.com/translate_error"; const char* const kLanguageListFetchURL = - "http://translate.googleapis.com/translate_a/l?client=chrome&cb=sl"; + "https://translate.googleapis.com/translate_a/l?client=chrome&cb=sl"; const int kMaxRetryLanguageListFetch = 5; const int kTranslateScriptExpirationDelayDays = 1; |