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

Unified Diff: chrome/installer/util/master_preferences.h

Issue 196413016: Move CommandLine to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months 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/installer_state.h ('k') | chrome/installer/util/product.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/master_preferences.h
diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h
index b068b462fd113dc66ac98cd75d53207d4f231661..83f115002590d73f0ab90aa75e414dec1cf2a9b0 100644
--- a/chrome/installer/util/master_preferences.h
+++ b/chrome/installer/util/master_preferences.h
@@ -85,7 +85,7 @@ class MasterPreferences {
// is present in the command line.
// The options from the preference file and command line are merged, with the
// ones from the command line taking precedence in case of a conflict.
- explicit MasterPreferences(const CommandLine& cmd_line);
+ explicit MasterPreferences(const base::CommandLine& cmd_line);
// Parses a specific preferences file and does not merge any command line
// switches with the distribution dictionary.
@@ -191,7 +191,7 @@ class MasterPreferences {
static const MasterPreferences& ForCurrentProcess();
protected:
- void InitializeFromCommandLine(const CommandLine& cmd_line);
+ void InitializeFromCommandLine(const base::CommandLine& cmd_line);
// Initializes the instance from a given JSON string, returning true if the
// string was successfully parsed.
« no previous file with comments | « chrome/installer/util/installer_state.h ('k') | chrome/installer/util/product.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698