chrome/installer/gcapi/gcapi.cc - Issue 371753002: Installer refactoring: using string16 instead of wstring for GoogleUpdateSettings.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/installer/gcapi/gcapi.cc

Issue 371753002: Installer refactoring: using string16 instead of wstring for GoogleUpdateSettings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Updating callers to use string16 to interface with GoogleUpdateSettings. 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 side-by-side diff with in-line comments

Download patch

Index: chrome/installer/gcapi/gcapi.cc

diff --git a/chrome/installer/gcapi/gcapi.cc b/chrome/installer/gcapi/gcapi.cc

index 3d73af0ba6ef66234ab8c57217b0d430982fcd2c..0606988ab836cc22cb9d9bab764fbd865713872e 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 &&

huangs 2014/07/07 19:29:24 ReadValue() takes wstring, but I found other place

@@ -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) {

« no previous file with comments | « no previous file | chrome/installer/util/google_update_settings.h » ('j') | chrome/installer/util/google_update_settings.cc » ('J')