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

Unified Diff: chrome/installer/util/google_update_settings.h

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
Index: chrome/installer/util/google_update_settings.h
diff --git a/chrome/installer/util/google_update_settings.h b/chrome/installer/util/google_update_settings.h
index 7cd4b754b32ccdf620c84422de32d3da544e7846..8e99978f8fcc902edbb911b951315ad680d46314 100644
--- a/chrome/installer/util/google_update_settings.h
+++ b/chrome/installer/util/google_update_settings.h
@@ -166,7 +166,7 @@ class GoogleUpdateSettings {
// it is a multi-install product, in which case it will return "m",
// "unknown-m", "dev-m", or "beta-m").
static bool GetChromeChannelAndModifiers(bool system_install,
- string16* channel);
+ base::string16* channel);
// This method changes the Google Update "ap" value to move the installation
// on to or off of one of the recovery channels.
@@ -229,7 +229,7 @@ class GoogleUpdateSettings {
// Returns Google Update's uninstall command line, or an empty string if none
// is found.
- static string16 GetUninstallCommandLine(bool system_install);
+ static base::string16 GetUninstallCommandLine(bool system_install);
// Returns the version of Google Update that is installed.
static Version GetGoogleUpdateVersion(bool system_install);
@@ -266,7 +266,7 @@ class GoogleUpdateSettings {
// (even if the label does not need to be set for this particular distribution
// type).
static bool SetExperimentLabels(bool system_install,
- const string16& experiment_labels);
+ const base::string16& experiment_labels);
// Reads the Google Update experiment_labels value in the ClientState key for
// this Chrome product and writes it into |experiment_labels|. If the key or
@@ -275,7 +275,7 @@ class GoogleUpdateSettings {
// this will do nothing to |experiment_labels|. This will return true if the
// label did not exist, or was successfully read.
static bool ReadExperimentLabels(bool system_install,
- string16* experiment_labels);
+ base::string16* experiment_labels);
private:
DISALLOW_IMPLICIT_CONSTRUCTORS(GoogleUpdateSettings);
« no previous file with comments | « chrome/installer/util/google_update_experiment_util.cc ('k') | chrome/installer/util/google_update_settings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698