| Index: chrome/installer/util/app_command.h
|
| diff --git a/chrome/installer/util/app_command.h b/chrome/installer/util/app_command.h
|
| index c0cca9b130e6042a8ae1eb10e9b4cd5ba0f2e290..245619703c8e82e97598db813b0609a87abf2bd0 100644
|
| --- a/chrome/installer/util/app_command.h
|
| +++ b/chrome/installer/util/app_command.h
|
| @@ -27,7 +27,7 @@ class AppCommand {
|
| AppCommand();
|
| // Constructs a new command that will execute the given |command_line|.
|
| // All other properties default to false.
|
| - explicit AppCommand(const string16& command_line);
|
| + explicit AppCommand(const base::string16& command_line);
|
| // The implicit dtor, copy ctor and assignment operator are desired.
|
|
|
| // Initializes an instance from the command in |key|.
|
| @@ -36,14 +36,14 @@ class AppCommand {
|
| // Adds to |item_list| work items to write this object to the key named
|
| // |command_path| under |predefined_root|.
|
| void AddWorkItems(HKEY predefined_root,
|
| - const string16& command_path,
|
| + const base::string16& command_path,
|
| WorkItemList* item_list) const;
|
|
|
| // Returns the command-line for the app command as it is represented in the
|
| // registry. Use CommandLine::FromString() on this value to check arguments
|
| // or to launch the command.
|
| - const string16& command_line() const { return command_line_; }
|
| - void set_command_line(const string16& command_line) {
|
| + const base::string16& command_line() const { return command_line_; }
|
| + void set_command_line(const base::string16& command_line) {
|
| command_line_ = command_line;
|
| }
|
|
|
| @@ -66,7 +66,7 @@ class AppCommand {
|
| }
|
|
|
| protected:
|
| - string16 command_line_;
|
| + base::string16 command_line_;
|
| bool sends_pings_;
|
| bool is_web_accessible_;
|
| bool is_auto_run_on_os_upgrade_;
|
|
|