diff options
| author | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 03:24:45 +0000 |
|---|---|---|
| committer | huanr@chromium.org <huanr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-17 03:24:45 +0000 |
| commit | 1bcb9751195e00e3caa8d2ef1f4593da391154fd (patch) | |
| tree | 0005020b7566ad51ede90cbdec87af143a116efe /chrome/installer/util/google_chrome_distribution.h | |
| parent | 4b92b19e3788372083133825f53c9b35972a8d36 (diff) | |
| download | chromium_src-1bcb9751195e00e3caa8d2ef1f4593da391154fd.zip chromium_src-1bcb9751195e00e3caa8d2ef1f4593da391154fd.tar.gz chromium_src-1bcb9751195e00e3caa8d2ef1f4593da391154fd.tar.bz2 | |
Add google chrome sxs distribution for installer and omaha launcher.
BUG=35574
TEST=setup.exe can install/uninstall Google Chrome as before.
setup.exe --chrome-sxs can install/uninstall Chrome to alternative path.
Both versions of Chrome can co-exist.
Review URL: http://codereview.chromium.org/596069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39186 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 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/chrome/installer/util/google_chrome_distribution.h b/chrome/installer/util/google_chrome_distribution.h index c31ca07..0af7e3f 100644 --- a/chrome/installer/util/google_chrome_distribution.h +++ b/chrome/installer/util/google_chrome_distribution.h @@ -88,8 +88,17 @@ class GoogleChromeDistribution : public BrowserDistribution { // outcome in the registry. virtual void InactiveUserToastExperiment(int flavor, bool system_install); + std::wstring product_guid() { return product_guid_; } + + protected: + void set_product_guid(std::wstring guid) { product_guid_ = guid; } + + // Disallow construction from others. + GoogleChromeDistribution(); + private: friend class BrowserDistribution; + FRIEND_TEST(GoogleChromeDistributionTest, TestExtractUninstallMetrics); // Extracts uninstall metrics from the JSON file located at file_path. @@ -111,8 +120,8 @@ class GoogleChromeDistribution : public BrowserDistribution { virtual bool BuildUninstallMetricsString( DictionaryValue* uninstall_metrics_dict, std::wstring* metrics); - // Disallow construction from non-friends. - GoogleChromeDistribution() {} + // The product ID for Google Update. + std::wstring product_guid_; }; #endif // CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_ |