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

Side by Side Diff: chrome/browser/update_client/chrome_update_query_params_delegate.cc

Issue 1269773002: Cleanup VersionInfo after componentization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 4 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/update_client/chrome_update_query_params_delegate.h" 5 #include "chrome/browser/update_client/chrome_update_query_params_delegate.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/strings/stringprintf.h" 8 #include "base/strings/stringprintf.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/common/chrome_version_info.h" 10 #include "chrome/common/channel_info.h"
11 #include "components/version_info/version_info.h"
11 12
12 namespace { 13 namespace {
13 14
14 const char kUnknown[] = "unknown"; 15 const char kUnknown[] = "unknown";
15 const char kStable[] = "stable"; 16 const char kStable[] = "stable";
16 const char kBeta[] = "beta"; 17 const char kBeta[] = "beta";
17 const char kDev[] = "dev"; 18 const char kDev[] = "dev";
18 const char kCanary[] = "canary"; 19 const char kCanary[] = "canary";
19 20
20 base::LazyInstance<ChromeUpdateQueryParamsDelegate> g_delegate = 21 base::LazyInstance<ChromeUpdateQueryParamsDelegate> g_delegate =
21 LAZY_INSTANCE_INITIALIZER; 22 LAZY_INSTANCE_INITIALIZER;
22 23
23 } // namespace 24 } // namespace
24 25
25 ChromeUpdateQueryParamsDelegate::ChromeUpdateQueryParamsDelegate() { 26 ChromeUpdateQueryParamsDelegate::ChromeUpdateQueryParamsDelegate() {
26 } 27 }
27 28
28 ChromeUpdateQueryParamsDelegate::~ChromeUpdateQueryParamsDelegate() { 29 ChromeUpdateQueryParamsDelegate::~ChromeUpdateQueryParamsDelegate() {
29 } 30 }
30 31
31 // static 32 // static
32 ChromeUpdateQueryParamsDelegate* 33 ChromeUpdateQueryParamsDelegate*
33 ChromeUpdateQueryParamsDelegate::GetInstance() { 34 ChromeUpdateQueryParamsDelegate::GetInstance() {
34 return g_delegate.Pointer(); 35 return g_delegate.Pointer();
35 } 36 }
36 37
37 std::string ChromeUpdateQueryParamsDelegate::GetExtraParams() { 38 std::string ChromeUpdateQueryParamsDelegate::GetExtraParams() {
38 return base::StringPrintf("&prodchannel=%s&prodversion=%s&lang=%s", 39 return base::StringPrintf(
39 GetChannelString(), 40 "&prodchannel=%s&prodversion=%s&lang=%s", GetChannelString(),
40 chrome::VersionInfo().Version().c_str(), GetLang()); 41 version_info::GetVersionNumber().c_str(), GetLang());
41 } 42 }
42 43
43 // static 44 // static
44 const char* ChromeUpdateQueryParamsDelegate::GetChannelString() { 45 const char* ChromeUpdateQueryParamsDelegate::GetChannelString() {
45 switch (chrome::VersionInfo::GetChannel()) { 46 switch (chrome::GetChannel()) {
46 case version_info::Channel::STABLE: 47 case version_info::Channel::STABLE:
47 return kStable; 48 return kStable;
48 break; 49 break;
49 case version_info::Channel::BETA: 50 case version_info::Channel::BETA:
50 return kBeta; 51 return kBeta;
51 break; 52 break;
52 case version_info::Channel::DEV: 53 case version_info::Channel::DEV:
53 return kDev; 54 return kDev;
54 break; 55 break;
55 case version_info::Channel::CANARY: 56 case version_info::Channel::CANARY:
56 return kCanary; 57 return kCanary;
57 break; 58 break;
58 case version_info::Channel::UNKNOWN: 59 case version_info::Channel::UNKNOWN:
59 return kUnknown; 60 return kUnknown;
60 break; 61 break;
61 } 62 }
62 return kUnknown; 63 return kUnknown;
63 } 64 }
64 65
65 // static 66 // static
66 const char* ChromeUpdateQueryParamsDelegate::GetLang() { 67 const char* ChromeUpdateQueryParamsDelegate::GetLang() {
67 return g_browser_process->GetApplicationLocale().c_str(); 68 return g_browser_process->GetApplicationLocale().c_str();
68 } 69 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698