Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(789)

Side by Side Diff: components/translate/core/browser/translate_script.cc

Issue 378253002: Fix translate namespace (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing android build errors Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/translate/core/browser/translate_script.h" 5 #include "components/translate/core/browser/translate_script.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/strings/string_piece.h" 11 #include "base/strings/string_piece.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "base/strings/stringprintf.h" 13 #include "base/strings/stringprintf.h"
14 #include "components/translate/core/browser/translate_url_fetcher.h" 14 #include "components/translate/core/browser/translate_url_fetcher.h"
15 #include "components/translate/core/browser/translate_url_util.h" 15 #include "components/translate/core/browser/translate_url_util.h"
16 #include "components/translate/core/common/translate_switches.h" 16 #include "components/translate/core/common/translate_switches.h"
17 #include "components/translate/core/common/translate_util.h" 17 #include "components/translate/core/common/translate_util.h"
18 #include "google_apis/google_api_keys.h" 18 #include "google_apis/google_api_keys.h"
19 #include "grit/component_resources.h" 19 #include "grit/component_resources.h"
20 #include "net/base/escape.h" 20 #include "net/base/escape.h"
21 #include "net/base/url_util.h" 21 #include "net/base/url_util.h"
22 #include "ui/base/resource/resource_bundle.h" 22 #include "ui/base/resource/resource_bundle.h"
23 23
24 namespace translate {
25
24 namespace { 26 namespace {
25 27
26 const int kExpirationDelayDays = 1; 28 const int kExpirationDelayDays = 1;
27 29
28 } // namespace 30 } // namespace
29 31
30 const char TranslateScript::kScriptURL[] = 32 const char TranslateScript::kScriptURL[] =
31 "https://translate.google.com/translate_a/element.js"; 33 "https://translate.google.com/translate_a/element.js";
32 const char TranslateScript::kRequestHeader[] = 34 const char TranslateScript::kRequestHeader[] =
33 "Google-Translate-Element-Mode: library"; 35 "Google-Translate-Element-Mode: library";
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 translate_script_url = net::AppendQueryParameter( 96 translate_script_url = net::AppendQueryParameter(
95 translate_script_url, 97 translate_script_url,
96 kCssLoaderCallbackQueryName, 98 kCssLoaderCallbackQueryName,
97 kCssLoaderCallbackQueryValue); 99 kCssLoaderCallbackQueryValue);
98 translate_script_url = net::AppendQueryParameter( 100 translate_script_url = net::AppendQueryParameter(
99 translate_script_url, 101 translate_script_url,
100 kJavascriptLoaderCallbackQueryName, 102 kJavascriptLoaderCallbackQueryName,
101 kJavascriptLoaderCallbackQueryValue); 103 kJavascriptLoaderCallbackQueryValue);
102 #endif // !defined(OS_IOS) 104 #endif // !defined(OS_IOS)
103 105
104 translate_script_url = 106 translate_script_url = AddHostLocaleToUrl(translate_script_url);
105 TranslateURLUtil::AddHostLocaleToUrl(translate_script_url); 107 translate_script_url = AddApiKeyToUrl(translate_script_url);
106 translate_script_url =
107 TranslateURLUtil::AddApiKeyToUrl(translate_script_url);
108 108
109 fetcher_.reset(new TranslateURLFetcher(kFetcherId)); 109 fetcher_.reset(new TranslateURLFetcher(kFetcherId));
110 fetcher_->set_extra_request_header(kRequestHeader); 110 fetcher_->set_extra_request_header(kRequestHeader);
111 fetcher_->Request( 111 fetcher_->Request(
112 translate_script_url, 112 translate_script_url,
113 base::Bind(&TranslateScript::OnScriptFetchComplete, 113 base::Bind(&TranslateScript::OnScriptFetchComplete,
114 base::Unretained(this))); 114 base::Unretained(this)));
115 } 115 }
116 116
117 117
(...skipping 29 matching lines...) Expand all
147 expiration_delay_); 147 expiration_delay_);
148 } 148 }
149 149
150 for (RequestCallbackList::iterator it = callback_list_.begin(); 150 for (RequestCallbackList::iterator it = callback_list_.begin();
151 it != callback_list_.end(); 151 it != callback_list_.end();
152 ++it) { 152 ++it) {
153 it->Run(success, data); 153 it->Run(success, data);
154 } 154 }
155 callback_list_.clear(); 155 callback_list_.clear();
156 } 156 }
157
158 } // namespace translate
OLDNEW
« no previous file with comments | « components/translate/core/browser/translate_script.h ('k') | components/translate/core/browser/translate_script_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698