| Index: chrome/installer/util/chrome_browser_operations.h
|
| diff --git a/chrome/installer/util/chrome_browser_operations.h b/chrome/installer/util/chrome_browser_operations.h
|
| index 573b39aa1f3a8a61029cc8511407357740cca448..e0e6e4d0a51ab55cf0356fc404b21e8bad4a7762 100644
|
| --- a/chrome/installer/util/chrome_browser_operations.h
|
| +++ b/chrome/installer/util/chrome_browser_operations.h
|
| @@ -17,31 +17,31 @@ class ChromeBrowserOperations : public ProductOperations {
|
| ChromeBrowserOperations() {}
|
|
|
| virtual void ReadOptions(const MasterPreferences& prefs,
|
| - std::set<string16>* options) const OVERRIDE;
|
| + std::set<base::string16>* options) const OVERRIDE;
|
|
|
| virtual void ReadOptions(const CommandLine& uninstall_command,
|
| - std::set<string16>* options) const OVERRIDE;
|
| + std::set<base::string16>* options) const OVERRIDE;
|
|
|
| virtual void AddKeyFiles(
|
| - const std::set<string16>& options,
|
| + const std::set<base::string16>& options,
|
| std::vector<base::FilePath>* key_files) const OVERRIDE;
|
|
|
| virtual void AddComDllList(
|
| - const std::set<string16>& options,
|
| + const std::set<base::string16>& options,
|
| std::vector<base::FilePath>* com_dll_list) const OVERRIDE;
|
|
|
| - virtual void AppendProductFlags(const std::set<string16>& options,
|
| + virtual void AppendProductFlags(const std::set<base::string16>& options,
|
| CommandLine* cmd_line) const OVERRIDE;
|
|
|
| - virtual void AppendRenameFlags(const std::set<string16>& options,
|
| + virtual void AppendRenameFlags(const std::set<base::string16>& options,
|
| CommandLine* cmd_line) const OVERRIDE;
|
|
|
| - virtual bool SetChannelFlags(const std::set<string16>& options,
|
| + virtual bool SetChannelFlags(const std::set<base::string16>& options,
|
| bool set,
|
| ChannelInfo* channel_info) const OVERRIDE;
|
|
|
| virtual bool ShouldCreateUninstallEntry(
|
| - const std::set<string16>& options) const OVERRIDE;
|
| + const std::set<base::string16>& options) const OVERRIDE;
|
|
|
| virtual void AddDefaultShortcutProperties(
|
| BrowserDistribution* dist,
|
| @@ -49,7 +49,7 @@ class ChromeBrowserOperations : public ProductOperations {
|
| ShellUtil::ShortcutProperties* properties) const OVERRIDE;
|
|
|
| virtual void LaunchUserExperiment(const base::FilePath& setup_path,
|
| - const std::set<string16>& options,
|
| + const std::set<base::string16>& options,
|
| InstallStatus status,
|
| bool system_level) const OVERRIDE;
|
|
|
|
|