diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 22:18:57 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-04 22:18:57 +0000 |
| commit | 74d1eecc72f97cb759ea252d8838f5ee46670938 (patch) | |
| tree | 0de991eb6f83c7390d4a72c6b467a2ed9dd3582d /chrome/app/client_util.cc | |
| parent | ef9fc5845fa7e3d2e9b601bfae60805b8f1c3b89 (diff) | |
| download | chromium_src-74d1eecc72f97cb759ea252d8838f5ee46670938.zip chromium_src-74d1eecc72f97cb759ea252d8838f5ee46670938.tar.gz chromium_src-74d1eecc72f97cb759ea252d8838f5ee46670938.tar.bz2 | |
Continue to remove CHROME_FRAME_BUILD define from code that goes into chrome.dll. This reworks the browser distribution code to use the ChromeFrameBrowserDistribution iff --chrome-frame is present on the command line.
Also,
* At startup, chrome.exe now uses the BrowserDistribution code to determine where the Chromium version key resides (instead of hard coding it).
* The installer now propagates the presence of --verbose-logging to uninstalls.
* The chrome_launcher now allows the --chrome-frame switch through to chrome.
* The installer now accepts a --chrome-frame switch.
* Remove almost all occurences of the CHROME_FRAME_BUILD define from the installer.
BUG=26012, 26603
TEST=Chrome Frame still builds and runs correctly. Chrome Frame builds built without 'branding'='Chrome' now install correctly.
Review URL: http://codereview.chromium.org/345021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31015 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app/client_util.cc')
| -rw-r--r-- | chrome/app/client_util.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/app/client_util.cc b/chrome/app/client_util.cc index 7fb49ca..d9b53a4 100644 --- a/chrome/app/client_util.cc +++ b/chrome/app/client_util.cc @@ -8,6 +8,7 @@ #include "chrome/app/breakpad_win.h" #include "chrome/app/client_util.h" #include "chrome/common/result_codes.h" +#include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/google_update_constants.h" #include "chrome/installer/util/util_constants.h" @@ -189,7 +190,8 @@ class ChromeDllLoader : public MainDllLoader { class ChromiumDllLoader : public MainDllLoader { public: virtual std::wstring GetRegistryPath() { - return L"Software\\Chromium"; + BrowserDistribution* dist = BrowserDistribution::GetDistribution(); + return dist->GetVersionKey(); } }; |