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

Side by Side Diff: chrome/browser/translate/translate_script.cc

Issue 131463002: Move TranslateURLFetcher to the translate component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix translate.gypi for real Created 6 years, 11 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/translate/translate_script.h" 5 #include "chrome/browser/translate/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 "chrome/browser/translate/translate_url_fetcher.h" 14 #include "chrome/browser/translate/chrome_translate_delegate.h"
15 #include "chrome/browser/translate/translate_url_util.h" 15 #include "chrome/browser/translate/translate_url_util.h"
16 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
17 #include "components/translate/core/browser/translate_url_fetcher.h"
17 #include "components/translate/core/common/translate_util.h" 18 #include "components/translate/core/common/translate_util.h"
18 #include "google_apis/google_api_keys.h" 19 #include "google_apis/google_api_keys.h"
19 #include "grit/browser_resources.h" 20 #include "grit/browser_resources.h"
20 #include "net/base/escape.h" 21 #include "net/base/escape.h"
21 #include "net/base/url_util.h" 22 #include "net/base/url_util.h"
22 #include "ui/base/resource/resource_bundle.h" 23 #include "ui/base/resource/resource_bundle.h"
23 24
24 namespace { 25 namespace {
25 26
26 const int kExpirationDelayDays = 1; 27 const int kExpirationDelayDays = 1;
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 translate_script_url, 98 translate_script_url,
98 kJavascriptLoaderCallbackQueryName, 99 kJavascriptLoaderCallbackQueryName,
99 kJavascriptLoaderCallbackQueryValue); 100 kJavascriptLoaderCallbackQueryValue);
100 #endif // !defined(OS_IOS) 101 #endif // !defined(OS_IOS)
101 102
102 translate_script_url = 103 translate_script_url =
103 TranslateURLUtil::AddHostLocaleToUrl(translate_script_url); 104 TranslateURLUtil::AddHostLocaleToUrl(translate_script_url);
104 translate_script_url = 105 translate_script_url =
105 TranslateURLUtil::AddApiKeyToUrl(translate_script_url); 106 TranslateURLUtil::AddApiKeyToUrl(translate_script_url);
106 107
107 fetcher_.reset(new TranslateURLFetcher(kFetcherId)); 108 fetcher_.reset(new TranslateURLFetcher(
109 kFetcherId, ChromeTranslateDelegate::GetInstance()));
108 fetcher_->set_extra_request_header(kRequestHeader); 110 fetcher_->set_extra_request_header(kRequestHeader);
109 fetcher_->Request( 111 fetcher_->Request(
110 translate_script_url, 112 translate_script_url,
111 base::Bind(&TranslateScript::OnScriptFetchComplete, 113 base::Bind(&TranslateScript::OnScriptFetchComplete,
112 base::Unretained(this))); 114 base::Unretained(this)));
113 } 115 }
114 116
115 117
116 void TranslateScript::OnScriptFetchComplete( 118 void TranslateScript::OnScriptFetchComplete(
117 int id, bool success, const std::string& data) { 119 int id, bool success, const std::string& data) {
(...skipping 22 matching lines...) Expand all
140 // scripts. 142 // scripts.
141 base::MessageLoop::current()->PostDelayedTask( 143 base::MessageLoop::current()->PostDelayedTask(
142 FROM_HERE, 144 FROM_HERE,
143 base::Bind(&TranslateScript::Clear, 145 base::Bind(&TranslateScript::Clear,
144 weak_method_factory_.GetWeakPtr()), 146 weak_method_factory_.GetWeakPtr()),
145 expiration_delay_); 147 expiration_delay_);
146 } 148 }
147 149
148 callback_.Run(success, data); 150 callback_.Run(success, data);
149 } 151 }
OLDNEW
« no previous file with comments | « chrome/browser/translate/translate_language_list.cc ('k') | chrome/browser/translate/translate_url_fetcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698