diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 14:35:53 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-13 14:35:53 +0000 |
| commit | a947ccbb9104c4ac6104837f00baca16d3a7ea62 (patch) | |
| tree | 3ef45854c369758b105ecf17112374de2a410d34 /chrome/installer/util/google_chrome_distribution.h | |
| parent | f7c1658f2adf64f36eb5950dda426097e6191c88 (diff) | |
| download | chromium_src-a947ccbb9104c4ac6104837f00baca16d3a7ea62.zip chromium_src-a947ccbb9104c4ac6104837f00baca16d3a7ea62.tar.gz chromium_src-a947ccbb9104c4ac6104837f00baca16d3a7ea62.tar.bz2 | |
Add a CEEE mode to the ChromeFrame distribution class.
Pass a MasterPreferences into BrowserDistribution et al. to allow for preferences-based behaviour.
Add a GetComDllList() method that returns the set of registerable components for that distribution.
Change GetKeyFile() on BrowserDistribution to GetKeyFiles().
Refactor GetMasterPreferencesForCurrentProcess into a static method on MasterPreferences.
BUG=61609
TEST=None
Review URL: http://codereview.chromium.org/5558006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68996 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 | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h index 221f6b4..9a84b94 100644 --- a/chrome/installer/util/google_chrome_distribution.h +++ b/chrome/installer/util/google_chrome_distribution.h @@ -9,6 +9,8 @@ #define CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_ #pragma once +#include <string> + #include "base/gtest_prod_util.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/util_constants.h" @@ -83,7 +85,8 @@ class GoogleChromeDistribution : public BrowserDistribution { void set_product_guid(std::wstring guid) { product_guid_ = guid; } // Disallow construction from others. - GoogleChromeDistribution(); + explicit GoogleChromeDistribution( + const installer_util::MasterPreferences& prefs); private: friend class BrowserDistribution; |