summaryrefslogtreecommitdiffstats
path: root/chrome/installer/gcapi
diff options
context:
space:
mode:
authorhuangs@chromium.org <huangs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-08 13:59:44 +0000
committerhuangs@chromium.org <huangs@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-07-08 13:59:44 +0000
commitecce528ba3b2b52f2467f5248903459dcfb97357 (patch)
tree3762e251d04dd858af7a23bdc4fc0df307539379 /chrome/installer/gcapi
parent1e07d782b9f404edd95c70401ea650bc63225ca2 (diff)
downloadchromium_src-ecce528ba3b2b52f2467f5248903459dcfb97357.zip
chromium_src-ecce528ba3b2b52f2467f5248903459dcfb97357.tar.gz
chromium_src-ecce528ba3b2b52f2467f5248903459dcfb97357.tar.bz2
Installer refactoring: using string16 instead of wstring for GoogleUpdateSettings.
BUG=297647 Review URL: https://codereview.chromium.org/371753002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281740 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/gcapi')
-rw-r--r--chrome/installer/gcapi/gcapi.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc
index 3d73af0..0606988 100644
--- a/chrome/installer/gcapi/gcapi.cc
+++ b/chrome/installer/gcapi/gcapi.cc
@@ -602,7 +602,7 @@ int __stdcall GoogleChromeDaysSinceLastRun() {
kChromeRegClientStateKey,
KEY_QUERY_VALUE | KEY_WOW64_32KEY);
if (client_state.Valid()) {
- std::wstring last_run;
+ base::string16 last_run;
int64 last_run_value = 0;
if (client_state.ReadValue(google_update::kRegLastRunTimeField,
&last_run) == ERROR_SUCCESS &&
@@ -715,7 +715,7 @@ BOOL __stdcall CanOfferRelaunch(const wchar_t** partner_brandcode_list,
// b) the installed brandcode should belong to that partner (in
// brandcode_list);
- std::wstring installed_brandcode;
+ base::string16 installed_brandcode;
bool valid_brandcode = false;
if (GoogleUpdateSettings::GetBrand(&installed_brandcode)) {
for (int i = 0; i < partner_brandcode_list_length; ++i) {