summaryrefslogtreecommitdiffstats
path: root/chrome/installer/setup/install_worker.h
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-22 07:35:50 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-22 07:35:50 +0000
commit1f04ef4db936365c0cc1990f1a2b8a7bbbe37653 (patch)
tree571f9feea8ed976c01a7bd1cf56cee9894d5c005 /chrome/installer/setup/install_worker.h
parent9246e364afd394dd3a7cc2bf838c7ea0b4fc1133 (diff)
downloadchromium_src-1f04ef4db936365c0cc1990f1a2b8a7bbbe37653.zip
chromium_src-1f04ef4db936365c0cc1990f1a2b8a7bbbe37653.tar.gz
chromium_src-1f04ef4db936365c0cc1990f1a2b8a7bbbe37653.tar.bz2
Move Version to base namespace.
Adds "using base::Version" to the header to avoid having to update everything at once. All forward declares and the locations where the forward declares are used are updated. Review URL: https://chromiumcodereview.appspot.com/14099010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195456 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/install_worker.h')
-rw-r--r--chrome/installer/setup/install_worker.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/chrome/installer/setup/install_worker.h b/chrome/installer/setup/install_worker.h
index b4497c7..8f2edb0 100644
--- a/chrome/installer/setup/install_worker.h
+++ b/chrome/installer/setup/install_worker.h
@@ -14,11 +14,11 @@
class BrowserDistribution;
class CommandLine;
-class Version;
class WorkItemList;
namespace base {
class FilePath;
+class Version;
}
namespace installer {
@@ -32,7 +32,7 @@ class Product;
// state key if running under an MSI installer.
void AddUninstallShortcutWorkItems(const InstallerState& installer_state,
const base::FilePath& setup_path,
- const Version& new_version,
+ const base::Version& new_version,
const Product& product,
WorkItemList* install_list);
@@ -41,7 +41,7 @@ void AddUninstallShortcutWorkItems(const InstallerState& installer_state,
// "lang" value is also set according to the currently selected translation.
void AddVersionKeyWorkItems(HKEY root,
BrowserDistribution* dist,
- const Version& new_version,
+ const base::Version& new_version,
bool add_language_identifier,
WorkItemList* list);
@@ -83,8 +83,8 @@ void AddUsageStatsWorkItems(const InstallationState& original_state,
// |current_version| can be NULL to indicate no Chrome is currently installed.
bool AppendPostInstallTasks(const InstallerState& installer_state,
const base::FilePath& setup_path,
- const Version* current_version,
- const Version& new_version,
+ const base::Version* current_version,
+ const base::Version& new_version,
const base::FilePath& temp_path,
WorkItemList* post_install_task_list);
@@ -106,8 +106,8 @@ void AddInstallWorkItems(const InstallationState& original_state,
const base::FilePath& archive_path,
const base::FilePath& src_path,
const base::FilePath& temp_path,
- const Version* current_version,
- const Version& new_version,
+ const base::Version* current_version,
+ const base::Version& new_version,
WorkItemList* install_list);
// Appends registration or unregistration work items to |work_item_list| for the
@@ -137,7 +137,7 @@ void AddSetMsiMarkerWorkItem(const InstallerState& installer_state,
void AddChromeFrameWorkItems(const InstallationState& original_state,
const InstallerState& installer_state,
const base::FilePath& setup_path,
- const Version& new_version,
+ const base::Version& new_version,
const Product& product,
WorkItemList* list);
@@ -147,7 +147,7 @@ void AddChromeFrameWorkItems(const InstallationState& original_state,
// delegate_execute.exe directly in |target_path|.
void AddDelegateExecuteWorkItems(const InstallerState& installer_state,
const base::FilePath& target_path,
- const Version& new_version,
+ const base::Version& new_version,
const Product& product,
WorkItemList* list);
@@ -158,7 +158,7 @@ void AddDelegateExecuteWorkItems(const InstallerState& installer_state,
// anything other than system-level Chrome/Chromium.
void AddActiveSetupWorkItems(const InstallerState& installer_state,
const base::FilePath& setup_path,
- const Version& new_version,
+ const base::Version& new_version,
const Product& product,
WorkItemList* list);
@@ -186,7 +186,7 @@ void RefreshElevationPolicy();
// currently being installed -- can be empty on uninstall.
void AddOsUpgradeWorkItems(const InstallerState& installer_state,
const base::FilePath& setup_path,
- const Version& new_version,
+ const base::Version& new_version,
const Product& product,
WorkItemList* install_list);
@@ -196,7 +196,7 @@ void AddOsUpgradeWorkItems(const InstallerState& installer_state,
// currently being installed -- can be empty on uninstall.
void AddQueryEULAAcceptanceWorkItems(const InstallerState& installer_state,
const base::FilePath& setup_path,
- const Version& new_version,
+ const base::Version& new_version,
const Product& product,
WorkItemList* work_item_list);
@@ -210,7 +210,7 @@ void AddQueryEULAAcceptanceWorkItems(const InstallerState& installer_state,
void AddQuickEnableChromeFrameWorkItems(const InstallerState& installer_state,
const InstallationState& machine_state,
const base::FilePath& setup_path,
- const Version& new_version,
+ const base::Version& new_version,
WorkItemList* work_item_list);
} // namespace installer