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

Unified Diff: chrome/installer/util/chrome_app_host_operations.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/chrome_app_host_operations.h
diff --git a/chrome/installer/util/chrome_app_host_operations.h b/chrome/installer/util/chrome_app_host_operations.h
index 3406dfc1f74d0580212e556a7687c6a3d1cd8946..cb954a58d9c22a74352d22fa8f393a6e22061831 100644
--- a/chrome/installer/util/chrome_app_host_operations.h
+++ b/chrome/installer/util/chrome_app_host_operations.h
@@ -18,31 +18,31 @@ class ChromeAppHostOperations : public ProductOperations {
ChromeAppHostOperations() {}
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,
@@ -50,7 +50,7 @@ class ChromeAppHostOperations : 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;
« no previous file with comments | « chrome/installer/util/chrome_app_host_distribution.cc ('k') | chrome/installer/util/chrome_app_host_operations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698