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

Unified Diff: chrome/installer/launcher_support/chrome_launcher_support.cc

Issue 94013004: Add base:: to string16s in chrome/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: try again Created 7 years 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
« no previous file with comments | « chrome/installer/gcapi/gcapi_reactivation_test.cc ('k') | chrome/installer/setup/archive_patch_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/launcher_support/chrome_launcher_support.cc
diff --git a/chrome/installer/launcher_support/chrome_launcher_support.cc b/chrome/installer/launcher_support/chrome_launcher_support.cc
index 5705e244f7dc456f6ac58136736e0da3d519c9ec..c28bf9977fe403abb101b0da3718902fee2798b4 100644
--- a/chrome/installer/launcher_support/chrome_launcher_support.cc
+++ b/chrome/installer/launcher_support/chrome_launcher_support.cc
@@ -50,10 +50,10 @@ const wchar_t kUninstallStringField[] = L"UninstallString";
bool GetClientStateValue(InstallationLevel level,
const wchar_t* app_guid,
const wchar_t* value_name,
- string16* value) {
+ base::string16* value) {
HKEY root_key = (level == USER_LEVEL_INSTALLATION) ?
HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
- string16 subkey(kGoogleRegClientStateKey);
+ base::string16 subkey(kGoogleRegClientStateKey);
subkey.append(1, L'\\').append(app_guid);
base::win::RegKey reg_key;
// Google Update always uses 32bit hive.
@@ -71,7 +71,7 @@ bool GetClientStateValue(InstallationLevel level,
bool IsProductInstalled(InstallationLevel level, const wchar_t* app_guid) {
HKEY root_key = (level == USER_LEVEL_INSTALLATION) ?
HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE;
- string16 subkey(kGoogleRegClientsKey);
+ base::string16 subkey(kGoogleRegClientsKey);
subkey.append(1, L'\\').append(app_guid);
base::win::RegKey reg_key;
// Google Update always uses 32bit hive.
@@ -81,7 +81,7 @@ bool IsProductInstalled(InstallationLevel level, const wchar_t* app_guid) {
}
bool IsAppLauncherEnabledAtLevel(InstallationLevel level) {
- string16 uninstall_arguments;
+ base::string16 uninstall_arguments;
if (GetClientStateValue(level,
kAppHostAppId,
kUninstallArgumentsField,
@@ -98,7 +98,7 @@ bool IsAppLauncherEnabledAtLevel(InstallationLevel level) {
// an error occurs or the product is not installed at the specified level.
base::FilePath GetSetupExeFromRegistry(InstallationLevel level,
const wchar_t* app_guid) {
- string16 uninstall;
+ base::string16 uninstall;
if (GetClientStateValue(level, app_guid, kUninstallStringField, &uninstall)) {
base::FilePath setup_exe_path(uninstall);
if (base::PathExists(setup_exe_path))
@@ -135,7 +135,7 @@ void UninstallLegacyAppLauncher(InstallationLevel level) {
base::FilePath setup_exe(GetSetupExeFromRegistry(level, kAppHostAppId));
if (setup_exe.empty())
return;
- string16 uninstall_arguments;
+ base::string16 uninstall_arguments;
if (GetClientStateValue(level,
kAppHostAppId,
kUninstallArgumentsField,
« no previous file with comments | « chrome/installer/gcapi/gcapi_reactivation_test.cc ('k') | chrome/installer/setup/archive_patch_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698