diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 20:32:00 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-14 20:32:00 +0000 |
| commit | 5ddd1eaaaaa5512ee780789bfb0164a97bca933d (patch) | |
| tree | d851d2b162561286fb86308415648ee6eee44984 /chrome/installer/util/google_chrome_distribution.h | |
| parent | befe84bbceb40e25af72c21aa6f8492d1eb7ae84 (diff) | |
| download | chromium_src-5ddd1eaaaaa5512ee780789bfb0164a97bca933d.zip chromium_src-5ddd1eaaaaa5512ee780789bfb0164a97bca933d.tar.gz chromium_src-5ddd1eaaaaa5512ee780789bfb0164a97bca933d.tar.bz2 | |
Revert 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/5729004
TBR=robertshield@chromium.org
Review URL: http://codereview.chromium.org/5756007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69167 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/google_chrome_distribution.h')
| -rw-r--r-- | chrome/installer/util/google_chrome_distribution.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h index 6dd0f6b..9a84b94 100644 --- a/chrome/installer/util/google_chrome_distribution.h +++ b/chrome/installer/util/google_chrome_distribution.h @@ -66,9 +66,9 @@ class GoogleChromeDistribution : public BrowserDistribution { virtual std::wstring GetVersionKey(); virtual void UpdateDiffInstallStatus(bool system_install, - bool incremental_install, installer::InstallStatus install_status); + bool incremental_install, installer_util::InstallStatus install_status); - virtual void LaunchUserExperiment(installer::InstallStatus status, + virtual void LaunchUserExperiment(installer_util::InstallStatus status, const installer::Version& version, const installer::Product& installation, bool system_level); @@ -86,7 +86,7 @@ class GoogleChromeDistribution : public BrowserDistribution { // Disallow construction from others. explicit GoogleChromeDistribution( - const installer::MasterPreferences& prefs); + const installer_util::MasterPreferences& prefs); private: friend class BrowserDistribution; |