diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 14:44:50 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-15 14:44:50 +0000 |
| commit | 74ca044ddeb27bca294a88f397e85429ce28e2b6 (patch) | |
| tree | b646397ff7ed1424b77ff4fa125e1151c100ef34 /chrome/installer/setup/install.h | |
| parent | c17bfcbba2d13a99d1e0a5d0e489fa86755450f8 (diff) | |
| download | chromium_src-74ca044ddeb27bca294a88f397e85429ce28e2b6.zip chromium_src-74ca044ddeb27bca294a88f397e85429ce28e2b6.tar.gz chromium_src-74ca044ddeb27bca294a88f397e85429ce28e2b6.tar.bz2 | |
Revert 69167, itself a revert of 69165 - Merge the installer, installer_util and setup_util namespaces into a single installer namespace.
BUG=61609
TEST=NONE
Review URL: http://codereview.chromium.org/5738009
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69256 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/setup/install.h')
| -rw-r--r-- | chrome/installer/setup/install.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/installer/setup/install.h b/chrome/installer/setup/install.h index bccb7e2..7a572b3b 100644 --- a/chrome/installer/setup/install.h +++ b/chrome/installer/setup/install.h @@ -39,10 +39,10 @@ class Package; // // Note: since caller unpacks Chrome to install_temp_path\source, the caller // is responsible for cleaning up install_temp_path. -installer_util::InstallStatus InstallOrUpdateChrome( +installer::InstallStatus InstallOrUpdateChrome( const FilePath& setup_path, const FilePath& archive_path, const FilePath& install_temp_path, const FilePath& prefs_path, - const installer_util::MasterPreferences& prefs, const Version& new_version, + const installer::MasterPreferences& prefs, const Version& new_version, const Package& package); // Registers or unregisters COM DLLs in a specific folder as declared in |