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

Unified Diff: chrome/installer/util/product.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/master_preferences.h ('k') | chrome/installer/util/product_operations.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/product.h
diff --git a/chrome/installer/util/product.h b/chrome/installer/util/product.h
index 9ff763b9b0e6f383d834a3915b6325816e4f4d0e..4e70b424b51f5a8312aac2def9fbd5256abb0367 100644
--- a/chrome/installer/util/product.h
+++ b/chrome/installer/util/product.h
@@ -14,7 +14,9 @@
#include "chrome/installer/util/shell_util.h"
#include "chrome/installer/util/util_constants.h"
+namespace base {
class CommandLine;
+}
namespace installer {
@@ -40,7 +42,8 @@ class Product {
void InitializeFromPreferences(const MasterPreferences& prefs);
- void InitializeFromUninstallCommand(const CommandLine& uninstall_command);
+ void InitializeFromUninstallCommand(
+ const base::CommandLine& uninstall_command);
BrowserDistribution* distribution() const {
return distribution_;
@@ -98,7 +101,7 @@ class Product {
// NOTE: The 'options' CommandLine object should only contain parameters.
// The program part will be ignored.
bool LaunchChromeAndWait(const base::FilePath& application_path,
- const CommandLine& options,
+ const base::CommandLine& options,
int32* exit_code) const;
// Sets the boolean MSI marker for this installation if set is true or clears
@@ -117,10 +120,10 @@ class Product {
void AddComDllList(std::vector<base::FilePath>* com_dll_list) const;
// See ProductOperations::AppendProductFlags.
- void AppendProductFlags(CommandLine* command_line) const;
+ void AppendProductFlags(base::CommandLine* command_line) const;
// See ProductOperations::AppendRenameFlags.
- void AppendRenameFlags(CommandLine* command_line) const;
+ void AppendRenameFlags(base::CommandLine* command_line) const;
// See Productoperations::SetChannelFlags.
bool SetChannelFlags(bool set, ChannelInfo* channel_info) const;
« no previous file with comments | « chrome/installer/util/master_preferences.h ('k') | chrome/installer/util/product_operations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698