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

Unified Diff: chrome/installer/util/chrome_binaries_operations.cc

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_binaries_operations.cc
diff --git a/chrome/installer/util/chrome_binaries_operations.cc b/chrome/installer/util/chrome_binaries_operations.cc
index b9e465887772422e42add98a58814996a37fff68..85ba7bf0e0cb73300269a5c9699b5feb97ca1072 100644
--- a/chrome/installer/util/chrome_binaries_operations.cc
+++ b/chrome/installer/util/chrome_binaries_operations.cc
@@ -16,31 +16,33 @@
namespace installer {
void ChromeBinariesOperations::ReadOptions(const MasterPreferences& prefs,
- std::set<string16>* options) const {
+ std::set<base::string16>* options)
+ const {
DCHECK(options);
options->insert(kOptionMultiInstall);
}
void ChromeBinariesOperations::ReadOptions(const CommandLine& uninstall_command,
- std::set<string16>* options) const {
+ std::set<base::string16>* options)
+ const {
DCHECK(options);
options->insert(kOptionMultiInstall);
}
void ChromeBinariesOperations::AddKeyFiles(
- const std::set<string16>& options,
+ const std::set<base::string16>& options,
std::vector<base::FilePath>* key_files) const {
DCHECK(key_files);
key_files->push_back(base::FilePath(installer::kChromeDll));
}
void ChromeBinariesOperations::AddComDllList(
- const std::set<string16>& options,
+ const std::set<base::string16>& options,
std::vector<base::FilePath>* com_dll_list) const {
}
void ChromeBinariesOperations::AppendProductFlags(
- const std::set<string16>& options,
+ const std::set<base::string16>& options,
CommandLine* cmd_line) const {
DCHECK(cmd_line);
@@ -52,7 +54,7 @@ void ChromeBinariesOperations::AppendProductFlags(
}
void ChromeBinariesOperations::AppendRenameFlags(
- const std::set<string16>& options,
+ const std::set<base::string16>& options,
CommandLine* cmd_line) const {
DCHECK(cmd_line);
@@ -64,14 +66,14 @@ void ChromeBinariesOperations::AppendRenameFlags(
}
bool ChromeBinariesOperations::SetChannelFlags(
- const std::set<string16>& options,
+ const std::set<base::string16>& options,
bool set,
ChannelInfo* channel_info) const {
return false;
}
bool ChromeBinariesOperations::ShouldCreateUninstallEntry(
- const std::set<string16>& options) const {
+ const std::set<base::string16>& options) const {
return false;
}
@@ -84,7 +86,7 @@ void ChromeBinariesOperations::AddDefaultShortcutProperties(
void ChromeBinariesOperations::LaunchUserExperiment(
const base::FilePath& setup_path,
- const std::set<string16>& options,
+ const std::set<base::string16>& options,
InstallStatus status,
bool system_level) const {
// Not meaningful to have binaries run experiments.
« no previous file with comments | « chrome/installer/util/chrome_binaries_operations.h ('k') | chrome/installer/util/chrome_browser_operations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698