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

Side by Side Diff: chrome/browser/component_updater/chrome_component_updater_configurator.cc

Issue 803313003: Rename omaha_client and similar tokens to update_client in all contexts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: rebase to master Created 5 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 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 "chrome/browser/component_updater/chrome_component_updater_configurator .h" 5 #include "chrome/browser/component_updater/chrome_component_updater_configurator .h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/compiler_specific.h" 12 #include "base/compiler_specific.h"
13 #include "base/strings/string_util.h" 13 #include "base/strings/string_util.h"
14 #include "base/version.h" 14 #include "base/version.h"
15 #if defined(OS_WIN) 15 #if defined(OS_WIN)
16 #include "base/win/win_util.h" 16 #include "base/win/win_util.h"
17 #endif // OS_WIN 17 #endif // OS_WIN
18 #include "build/build_config.h" 18 #include "build/build_config.h"
19 #include "chrome/browser/component_updater/component_patcher_operation_out_of_pr ocess.h" 19 #include "chrome/browser/component_updater/component_patcher_operation_out_of_pr ocess.h"
20 #include "chrome/browser/omaha_client/chrome_omaha_query_params_delegate.h" 20 #include "chrome/browser/update_client/chrome_update_query_params_delegate.h"
21 #include "chrome/common/chrome_version_info.h" 21 #include "chrome/common/chrome_version_info.h"
22 #include "components/component_updater/component_updater_configurator.h" 22 #include "components/component_updater/component_updater_configurator.h"
23 #include "components/component_updater/component_updater_switches.h" 23 #include "components/component_updater/component_updater_switches.h"
24 #include "content/public/browser/browser_thread.h" 24 #include "content/public/browser/browser_thread.h"
25 #include "net/url_request/url_request_context_getter.h" 25 #include "net/url_request/url_request_context_getter.h"
26 #include "url/gurl.h" 26 #include "url/gurl.h"
27 27
28 namespace component_updater { 28 namespace component_updater {
29 29
30 namespace { 30 namespace {
(...skipping 194 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 225
226 std::vector<GURL> ChromeConfigurator::PingUrl() const { 226 std::vector<GURL> ChromeConfigurator::PingUrl() const {
227 return pings_enabled_ ? UpdateUrl() : std::vector<GURL>(); 227 return pings_enabled_ ? UpdateUrl() : std::vector<GURL>();
228 } 228 }
229 229
230 base::Version ChromeConfigurator::GetBrowserVersion() const { 230 base::Version ChromeConfigurator::GetBrowserVersion() const {
231 return base::Version(chrome::VersionInfo().Version()); 231 return base::Version(chrome::VersionInfo().Version());
232 } 232 }
233 233
234 std::string ChromeConfigurator::GetChannel() const { 234 std::string ChromeConfigurator::GetChannel() const {
235 return ChromeOmahaQueryParamsDelegate::GetChannelString(); 235 return ChromeUpdateQueryParamsDelegate::GetChannelString();
236 } 236 }
237 237
238 std::string ChromeConfigurator::GetLang() const { 238 std::string ChromeConfigurator::GetLang() const {
239 return ChromeOmahaQueryParamsDelegate::GetLang(); 239 return ChromeUpdateQueryParamsDelegate::GetLang();
240 } 240 }
241 241
242 std::string ChromeConfigurator::GetOSLongName() const { 242 std::string ChromeConfigurator::GetOSLongName() const {
243 return chrome::VersionInfo().OSType(); 243 return chrome::VersionInfo().OSType();
244 } 244 }
245 245
246 std::string ChromeConfigurator::ExtraRequestParams() const { 246 std::string ChromeConfigurator::ExtraRequestParams() const {
247 return extra_info_; 247 return extra_info_;
248 } 248 }
249 249
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
284 284
285 } // namespace 285 } // namespace
286 286
287 Configurator* MakeChromeComponentUpdaterConfigurator( 287 Configurator* MakeChromeComponentUpdaterConfigurator(
288 const base::CommandLine* cmdline, 288 const base::CommandLine* cmdline,
289 net::URLRequestContextGetter* context_getter) { 289 net::URLRequestContextGetter* context_getter) {
290 return new ChromeConfigurator(cmdline, context_getter); 290 return new ChromeConfigurator(cmdline, context_getter);
291 } 291 }
292 292
293 } // namespace component_updater 293 } // namespace component_updater
OLDNEW
« no previous file with comments | « chrome/browser/browser_process_impl.cc ('k') | chrome/browser/component_updater/pnacl/pnacl_component_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698