summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/setup/install_worker.h4
-rw-r--r--chrome/installer/setup/setup_main.h5
-rw-r--r--chrome/installer/setup/setup_util.h7
-rw-r--r--chrome/installer/setup/uninstall.h4
-rw-r--r--chrome/installer/util/chrome_app_host_operations.h6
-rw-r--r--chrome/installer/util/chrome_binaries_operations.h6
-rw-r--r--chrome/installer/util/chrome_browser_operations.h6
-rw-r--r--chrome/installer/util/chrome_browser_sxs_operations.h4
-rw-r--r--chrome/installer/util/chrome_frame_operations.h6
-rw-r--r--chrome/installer/util/fake_product_state.h2
-rw-r--r--chrome/installer/util/install_util.h6
-rw-r--r--chrome/installer/util/installation_state.h6
-rw-r--r--chrome/installer/util/installation_validator.h7
-rw-r--r--chrome/installer/util/installer_state.h4
-rw-r--r--chrome/installer/util/master_preferences.h4
-rw-r--r--chrome/installer/util/product.h11
-rw-r--r--chrome/installer/util/product_operations.h9
-rw-r--r--chrome/installer/util/user_experiment.h5
18 files changed, 54 insertions, 48 deletions
diff --git a/chrome/installer/setup/install_worker.h b/chrome/installer/setup/install_worker.h
index abcd1e5..41d1b04 100644
--- a/chrome/installer/setup/install_worker.h
+++ b/chrome/installer/setup/install_worker.h
@@ -13,10 +13,10 @@
#include <vector>
class BrowserDistribution;
-class CommandLine;
class WorkItemList;
namespace base {
+class CommandLine;
class FilePath;
class Version;
}
@@ -161,7 +161,7 @@ void AddDeleteOldIELowRightsPolicyWorkItems(
// Utility method currently shared between install.cc and install_worker.cc
void AppendUninstallCommandLineFlags(const InstallerState& installer_state,
const Product& product,
- CommandLine* uninstall_cmd);
+ base::CommandLine* uninstall_cmd);
// Refreshes the elevation policy on platforms where it is supported.
void RefreshElevationPolicy();
diff --git a/chrome/installer/setup/setup_main.h b/chrome/installer/setup/setup_main.h
index 45f92d84..5bcf457 100644
--- a/chrome/installer/setup/setup_main.h
+++ b/chrome/installer/setup/setup_main.h
@@ -10,9 +10,8 @@
#include "chrome/installer/util/util_constants.h"
-class CommandLine;
-
namespace base {
+class CommandLine;
class FilePath;
} // namespace base
@@ -28,7 +27,7 @@ class MasterPreferences;
// |true| if installation was delegated to a pre-existing higher version.
InstallStatus InstallProductsHelper(const InstallationState& original_state,
const base::FilePath& setup_exe,
- const CommandLine& cmd_line,
+ const base::CommandLine& cmd_line,
const MasterPreferences& prefs,
const InstallerState& installer_state,
base::FilePath* installer_directory,
diff --git a/chrome/installer/setup/setup_util.h b/chrome/installer/setup/setup_util.h
index 897bf67..1d91cb8 100644
--- a/chrome/installer/setup/setup_util.h
+++ b/chrome/installer/setup/setup_util.h
@@ -17,9 +17,8 @@
#include "chrome/installer/util/browser_distribution.h"
#include "chrome/installer/util/util_constants.h"
-class CommandLine;
-
namespace base {
+class CommandLine;
class FilePath;
class Version;
}
@@ -79,7 +78,7 @@ bool GetExistingHigherInstaller(const InstallationState& original_state,
// invoked |setup_exe| runs the newly installed product prior to exiting.
// Returns true if |setup_exe| was launched, false otherwise.
bool DeferToExistingInstall(const base::FilePath& setup_exe,
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
const InstallerState& installer_state,
const base::FilePath& temp_path,
InstallStatus* install_status);
@@ -111,7 +110,7 @@ void MigrateGoogleUpdateStateMultiToSingle(
bool IsUninstallSuccess(InstallStatus install_status);
// Returns true if |cmd_line| contains unsupported (legacy) switches.
-bool ContainsUnsupportedSwitch(const CommandLine& cmd_line);
+bool ContainsUnsupportedSwitch(const base::CommandLine& cmd_line);
// Returns true if the processor is supported by chrome.
bool IsProcessorSupported();
diff --git a/chrome/installer/setup/uninstall.h b/chrome/installer/setup/uninstall.h
index 96c3411..2c9151c 100644
--- a/chrome/installer/setup/uninstall.h
+++ b/chrome/installer/setup/uninstall.h
@@ -13,9 +13,9 @@
#include "chrome/installer/util/util_constants.h"
class BrowserDistribution;
-class CommandLine;
namespace base {
+class CommandLine;
class FilePath;
}
@@ -76,7 +76,7 @@ installer::InstallStatus UninstallProduct(
const Product& dist,
bool remove_all,
bool force_uninstall,
- const CommandLine& cmd_line);
+ const base::CommandLine& cmd_line);
// Cleans up the installation directory after all uninstall operations have
// completed. Depending on what products are remaining, setup.exe and the
diff --git a/chrome/installer/util/chrome_app_host_operations.h b/chrome/installer/util/chrome_app_host_operations.h
index cb954a5..bbd75ba 100644
--- a/chrome/installer/util/chrome_app_host_operations.h
+++ b/chrome/installer/util/chrome_app_host_operations.h
@@ -20,7 +20,7 @@ class ChromeAppHostOperations : public ProductOperations {
virtual void ReadOptions(const MasterPreferences& prefs,
std::set<base::string16>* options) const OVERRIDE;
- virtual void ReadOptions(const CommandLine& uninstall_command,
+ virtual void ReadOptions(const base::CommandLine& uninstall_command,
std::set<base::string16>* options) const OVERRIDE;
virtual void AddKeyFiles(
@@ -32,10 +32,10 @@ class ChromeAppHostOperations : public ProductOperations {
std::vector<base::FilePath>* com_dll_list) const OVERRIDE;
virtual void AppendProductFlags(const std::set<base::string16>& options,
- CommandLine* cmd_line) const OVERRIDE;
+ base::CommandLine* cmd_line) const OVERRIDE;
virtual void AppendRenameFlags(const std::set<base::string16>& options,
- CommandLine* cmd_line) const OVERRIDE;
+ base::CommandLine* cmd_line) const OVERRIDE;
virtual bool SetChannelFlags(const std::set<base::string16>& options,
bool set,
diff --git a/chrome/installer/util/chrome_binaries_operations.h b/chrome/installer/util/chrome_binaries_operations.h
index d1015ed..929fa43 100644
--- a/chrome/installer/util/chrome_binaries_operations.h
+++ b/chrome/installer/util/chrome_binaries_operations.h
@@ -20,7 +20,7 @@ class ChromeBinariesOperations : public ProductOperations {
virtual void ReadOptions(const MasterPreferences& prefs,
std::set<base::string16>* options) const OVERRIDE;
- virtual void ReadOptions(const CommandLine& uninstall_command,
+ virtual void ReadOptions(const base::CommandLine& uninstall_command,
std::set<base::string16>* options) const OVERRIDE;
virtual void AddKeyFiles(
@@ -32,10 +32,10 @@ class ChromeBinariesOperations : public ProductOperations {
std::vector<base::FilePath>* com_dll_list) const OVERRIDE;
virtual void AppendProductFlags(const std::set<base::string16>& options,
- CommandLine* cmd_line) const OVERRIDE;
+ base::CommandLine* cmd_line) const OVERRIDE;
virtual void AppendRenameFlags(const std::set<base::string16>& options,
- CommandLine* cmd_line) const OVERRIDE;
+ base::CommandLine* cmd_line) const OVERRIDE;
virtual bool SetChannelFlags(const std::set<base::string16>& options,
bool set,
diff --git a/chrome/installer/util/chrome_browser_operations.h b/chrome/installer/util/chrome_browser_operations.h
index e0e6e4d..06bdb55 100644
--- a/chrome/installer/util/chrome_browser_operations.h
+++ b/chrome/installer/util/chrome_browser_operations.h
@@ -19,7 +19,7 @@ class ChromeBrowserOperations : public ProductOperations {
virtual void ReadOptions(const MasterPreferences& prefs,
std::set<base::string16>* options) const OVERRIDE;
- virtual void ReadOptions(const CommandLine& uninstall_command,
+ virtual void ReadOptions(const base::CommandLine& uninstall_command,
std::set<base::string16>* options) const OVERRIDE;
virtual void AddKeyFiles(
@@ -31,10 +31,10 @@ class ChromeBrowserOperations : public ProductOperations {
std::vector<base::FilePath>* com_dll_list) const OVERRIDE;
virtual void AppendProductFlags(const std::set<base::string16>& options,
- CommandLine* cmd_line) const OVERRIDE;
+ base::CommandLine* cmd_line) const OVERRIDE;
virtual void AppendRenameFlags(const std::set<base::string16>& options,
- CommandLine* cmd_line) const OVERRIDE;
+ base::CommandLine* cmd_line) const OVERRIDE;
virtual bool SetChannelFlags(const std::set<base::string16>& options,
bool set,
diff --git a/chrome/installer/util/chrome_browser_sxs_operations.h b/chrome/installer/util/chrome_browser_sxs_operations.h
index 5c82a3c..6a189d1a 100644
--- a/chrome/installer/util/chrome_browser_sxs_operations.h
+++ b/chrome/installer/util/chrome_browser_sxs_operations.h
@@ -17,10 +17,10 @@ class ChromeBrowserSxSOperations : public ChromeBrowserOperations {
ChromeBrowserSxSOperations() {}
virtual void AppendProductFlags(const std::set<base::string16>& options,
- CommandLine* cmd_line) const OVERRIDE;
+ base::CommandLine* cmd_line) const OVERRIDE;
virtual void AppendRenameFlags(const std::set<base::string16>& options,
- CommandLine* cmd_line) const OVERRIDE;
+ base::CommandLine* cmd_line) const OVERRIDE;
private:
DISALLOW_COPY_AND_ASSIGN(ChromeBrowserSxSOperations);
diff --git a/chrome/installer/util/chrome_frame_operations.h b/chrome/installer/util/chrome_frame_operations.h
index fb35a07..497a151 100644
--- a/chrome/installer/util/chrome_frame_operations.h
+++ b/chrome/installer/util/chrome_frame_operations.h
@@ -19,7 +19,7 @@ class ChromeFrameOperations : public ProductOperations {
virtual void ReadOptions(const MasterPreferences& prefs,
std::set<base::string16>* options) const OVERRIDE;
- virtual void ReadOptions(const CommandLine& uninstall_command,
+ virtual void ReadOptions(const base::CommandLine& uninstall_command,
std::set<base::string16>* options) const OVERRIDE;
virtual void AddKeyFiles(
@@ -31,10 +31,10 @@ class ChromeFrameOperations : public ProductOperations {
std::vector<base::FilePath>* com_dll_list) const OVERRIDE;
virtual void AppendProductFlags(const std::set<base::string16>& options,
- CommandLine* cmd_line) const OVERRIDE;
+ base::CommandLine* cmd_line) const OVERRIDE;
virtual void AppendRenameFlags(const std::set<base::string16>& options,
- CommandLine* cmd_line) const OVERRIDE;
+ base::CommandLine* cmd_line) const OVERRIDE;
virtual bool SetChannelFlags(const std::set<base::string16>& options,
bool set,
diff --git a/chrome/installer/util/fake_product_state.h b/chrome/installer/util/fake_product_state.h
index 27946b7..8b6e866 100644
--- a/chrome/installer/util/fake_product_state.h
+++ b/chrome/installer/util/fake_product_state.h
@@ -23,7 +23,7 @@ class FakeProductState : public ProductState {
}
void clear_usagestats() { has_usagestats_ = false; }
void SetUninstallProgram(const base::FilePath& setup_exe) {
- uninstall_command_ = CommandLine(setup_exe);
+ uninstall_command_ = base::CommandLine(setup_exe);
}
void AddUninstallSwitch(const std::string& option) {
uninstall_command_.AppendSwitch(option);
diff --git a/chrome/installer/util/install_util.h b/chrome/installer/util/install_util.h
index 1ea0edd..5bc6b91 100644
--- a/chrome/installer/util/install_util.h
+++ b/chrome/installer/util/install_util.h
@@ -41,12 +41,12 @@ class InstallUtil {
static void TriggerActiveSetupCommand();
// Launches given exe as admin on Vista.
- static bool ExecuteExeAsAdmin(const CommandLine& cmd, DWORD* exit_code);
+ static bool ExecuteExeAsAdmin(const base::CommandLine& cmd, DWORD* exit_code);
// Reads the uninstall command for Chromium from registry and returns it.
// If system_install is true the command is read from HKLM, otherwise
// from HKCU.
- static CommandLine GetChromeUninstallCmd(
+ static base::CommandLine GetChromeUninstallCmd(
bool system_install,
BrowserDistribution::Type distribution_type);
@@ -173,7 +173,7 @@ class InstallUtil {
// Composes |program| and |arguments| into |command_line|.
static void MakeUninstallCommand(const base::string16& program,
const base::string16& arguments,
- CommandLine* command_line);
+ base::CommandLine* command_line);
// Returns a string in the form YYYYMMDD of the current date.
static base::string16 GetCurrentDate();
diff --git a/chrome/installer/util/installation_state.h b/chrome/installer/util/installation_state.h
index 153760d2..28630cc 100644
--- a/chrome/installer/util/installation_state.h
+++ b/chrome/installer/util/installation_state.h
@@ -83,7 +83,9 @@ class ProductState {
bool is_msi() const { return msi_; }
// The command to uninstall the product; may be empty.
- const CommandLine& uninstall_command() const { return uninstall_command_; }
+ const base::CommandLine& uninstall_command() const {
+ return uninstall_command_;
+ }
// True if |uninstall_command| contains --multi-install.
bool is_multi_install() const { return multi_install_; }
@@ -107,7 +109,7 @@ class ProductState {
std::wstring brand_;
std::wstring rename_cmd_;
std::wstring oem_install_;
- CommandLine uninstall_command_;
+ base::CommandLine uninstall_command_;
AppCommands commands_;
DWORD eula_accepted_;
DWORD usagestats_;
diff --git a/chrome/installer/util/installation_validator.h b/chrome/installer/util/installation_validator.h
index 3dcc583..46212f6 100644
--- a/chrome/installer/util/installation_validator.h
+++ b/chrome/installer/util/installation_validator.h
@@ -15,9 +15,8 @@
#include "base/strings/string16.h"
#include "chrome/installer/util/browser_distribution.h"
-class CommandLine;
-
namespace base {
+class CommandLine;
class FilePath;
}
@@ -231,12 +230,12 @@ class InstallationValidator {
const base::string16& purpose,
bool* is_valid);
static void ValidateCommandExpectations(const ProductContext& ctx,
- const CommandLine& command,
+ const base::CommandLine& command,
const SwitchExpectations& expected,
const base::string16& source,
bool* is_valid);
static void ValidateUninstallCommand(const ProductContext& ctx,
- const CommandLine& command,
+ const base::CommandLine& command,
const base::string16& source,
bool* is_valid);
static void ValidateRenameCommand(const ProductContext& ctx,
diff --git a/chrome/installer/util/installer_state.h b/chrome/installer/util/installer_state.h
index fd65574..7b22cf6 100644
--- a/chrome/installer/util/installer_state.h
+++ b/chrome/installer/util/installer_state.h
@@ -23,7 +23,9 @@
#include <windows.h> // NOLINT
#endif
+namespace base {
class CommandLine;
+}
namespace installer {
@@ -73,7 +75,7 @@ class InstallerState {
explicit InstallerState(Level level);
// Initializes this object based on the current operation.
- void Initialize(const CommandLine& command_line,
+ void Initialize(const base::CommandLine& command_line,
const MasterPreferences& prefs,
const InstallationState& machine_state);
diff --git a/chrome/installer/util/master_preferences.h b/chrome/installer/util/master_preferences.h
index b068b46..83f1150 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.
diff --git a/chrome/installer/util/product.h b/chrome/installer/util/product.h
index 9ff763b..4e70b42 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;
diff --git a/chrome/installer/util/product_operations.h b/chrome/installer/util/product_operations.h
index bb6c208..d84a1b9 100644
--- a/chrome/installer/util/product_operations.h
+++ b/chrome/installer/util/product_operations.h
@@ -15,7 +15,10 @@
#include "chrome/installer/util/util_constants.h"
class BrowserDistribution;
+
+namespace base {
class CommandLine;
+}
namespace installer {
@@ -35,7 +38,7 @@ class ProductOperations {
std::set<base::string16>* options) const = 0;
// Reads product-specific options from |command|, adding them to |options|.
- virtual void ReadOptions(const CommandLine& command,
+ virtual void ReadOptions(const base::CommandLine& command,
std::set<base::string16>* options) const = 0;
// A key-file is a file such as a DLL on Windows that is expected to be in use
@@ -59,11 +62,11 @@ class ProductOperations {
// required for product-specific uninstall commands, but are of use for any
// invocation of setup.exe for the product.
virtual void AppendProductFlags(const std::set<base::string16>& options,
- CommandLine* cmd_line) const = 0;
+ base::CommandLine* cmd_line) const = 0;
// Given a command line, appends the set of product-specific rename flags.
virtual void AppendRenameFlags(const std::set<base::string16>& options,
- CommandLine* cmd_line) const = 0;
+ base::CommandLine* cmd_line) const = 0;
// Adds or removes product-specific flags in |channel_info|. Returns true if
// |channel_info| is modified.
diff --git a/chrome/installer/util/user_experiment.h b/chrome/installer/util/user_experiment.h
index 98fce5f..7856f77 100644
--- a/chrome/installer/util/user_experiment.h
+++ b/chrome/installer/util/user_experiment.h
@@ -11,9 +11,8 @@
#include "base/strings/string16.h"
#include "chrome/installer/util/util_constants.h"
-class CommandLine;
-
namespace base {
+class CommandLine;
class FilePath;
}
@@ -52,7 +51,7 @@ bool CreateExperimentDetails(int flavor, ExperimentDetails* experiment);
// After an install or upgrade the user might qualify to participate in an
// experiment. This function determines if the user qualifies and if so it
// sets the wheels in motion or in simple cases does the experiment itself.
-void LaunchBrowserUserExperiment(const CommandLine& base_command,
+void LaunchBrowserUserExperiment(const base::CommandLine& base_command,
InstallStatus status,
bool system_level);
generated by cgit v1.1 at 2024-07-23 00:43:16 +0000