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

Unified Diff: chrome/installer/util/installation_validator.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
« no previous file with comments | « chrome/installer/util/install_util.cc ('k') | chrome/installer/util/installation_validator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/installation_validator.h
diff --git a/chrome/installer/util/installation_validator.h b/chrome/installer/util/installation_validator.h
index 6072bae871f64627c7f584fa308f2228408bddb2..3dcc583a5f4b4332d0cd03cb9950552b63713259 100644
--- a/chrome/installer/util/installation_validator.h
+++ b/chrome/installer/util/installation_validator.h
@@ -95,7 +95,7 @@ class InstallationValidator {
typedef void (*CommandValidatorFn)(const ProductContext& ctx,
const AppCommand& app_cmd,
bool* is_valid);
- typedef std::map<string16, CommandValidatorFn> CommandExpectations;
+ typedef std::map<base::string16, CommandValidatorFn> CommandExpectations;
// An interface to product-specific validation rules.
class ProductRules {
@@ -187,11 +187,12 @@ class InstallationValidator {
// Helper to validate the values of bool elements in AppCommand, and to output
// error messages. |flag_expect| is a bit mask specifying the expected
// presence/absence of bool variables.
- static void ValidateAppCommandFlags(const ProductContext& ctx,
- const AppCommand& app_cmd,
- const std::set<string16>& flags_expected,
- const string16& name,
- bool* is_valid);
+ static void ValidateAppCommandFlags(
+ const ProductContext& ctx,
+ const AppCommand& app_cmd,
+ const std::set<base::string16>& flags_expected,
+ const base::string16& name,
+ bool* is_valid);
static void ValidateInstallCommand(const ProductContext& ctx,
const AppCommand& app_cmd,
const wchar_t* expected_command,
@@ -227,16 +228,16 @@ class InstallationValidator {
bool* is_valid);
static void ValidateSetupPath(const ProductContext& ctx,
const base::FilePath& setup_exe,
- const string16& purpose,
+ const base::string16& purpose,
bool* is_valid);
static void ValidateCommandExpectations(const ProductContext& ctx,
const CommandLine& command,
const SwitchExpectations& expected,
- const string16& source,
+ const base::string16& source,
bool* is_valid);
static void ValidateUninstallCommand(const ProductContext& ctx,
const CommandLine& command,
- const string16& source,
+ const base::string16& source,
bool* is_valid);
static void ValidateRenameCommand(const ProductContext& ctx,
bool* is_valid);
« no previous file with comments | « chrome/installer/util/install_util.cc ('k') | chrome/installer/util/installation_validator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698