diff options
| author | grt <grt@chromium.org> | 2015-06-02 10:33:09 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-06-02 17:33:38 +0000 |
| commit | 53cc88da9a258bc4a34c4bff50025ee044c2e64d (patch) | |
| tree | f780af9a433751021df9c17f04cb313851340c77 /chrome/installer/setup | |
| parent | ece99b7b319e515185cfce2ad71fd7f037eae927 (diff) | |
| download | chromium_src-53cc88da9a258bc4a34c4bff50025ee044c2e64d.zip chromium_src-53cc88da9a258bc4a34c4bff50025ee044c2e64d.tar.gz chromium_src-53cc88da9a258bc4a34c4bff50025ee044c2e64d.tar.bz2 | |
Beacons for tracking default browser status.
BUG=488247
R=gab@chromium.org,wfh@chromium.org
Review URL: https://codereview.chromium.org/1146843003
Cr-Commit-Position: refs/heads/master@{#332423}
Diffstat (limited to 'chrome/installer/setup')
| -rw-r--r-- | chrome/installer/setup/install.cc | 15 | ||||
| -rw-r--r-- | chrome/installer/setup/install_worker.cc | 2 |
2 files changed, 16 insertions, 1 deletions
diff --git a/chrome/installer/setup/install.cc b/chrome/installer/setup/install.cc index 68ecef4..58272b7 100644 --- a/chrome/installer/setup/install.cc +++ b/chrome/installer/setup/install.cc @@ -25,6 +25,7 @@ #include "chrome/installer/setup/install_worker.h" #include "chrome/installer/setup/setup_constants.h" #include "chrome/installer/util/auto_launch_util.h" +#include "chrome/installer/util/beacons.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/create_reg_key_work_item.h" #include "chrome/installer/util/delete_after_reboot_helper.h" @@ -582,6 +583,13 @@ InstallStatus InstallOrUpdateProduct( installer_state.target_path()); } } + + if (!installer_state.system_install()) { + DCHECK_EQ(chrome_product->distribution(), + BrowserDistribution::GetDistribution()); + UpdateDefaultBrowserBeaconForPath( + installer_state.target_path().Append(installer::kChromeExe)); + } } installer_state.UpdateStage(installer::REMOVING_OLD_VERSIONS); @@ -617,6 +625,11 @@ void HandleOsUpgradeForBrowser(const installer::InstallerState& installer_state, CreateOrUpdateShortcuts( chrome_exe, chrome, prefs, level, INSTALL_SHORTCUT_REPLACE_EXISTING); RegisterChromeOnMachine(installer_state, chrome, false); + + UpdateOsUpgradeBeacon(installer_state.system_install(), + BrowserDistribution::GetDistribution()); + if (!installer_state.system_install()) + UpdateDefaultBrowserBeaconForPath(chrome_exe); } } @@ -644,6 +657,8 @@ void HandleActiveSetupForBrowser(const base::FilePath& installation_root, base::FilePath chrome_exe(installation_root.Append(kChromeExe)); CreateOrUpdateShortcuts( chrome_exe, chrome, prefs, CURRENT_USER, install_operation); + + UpdateDefaultBrowserBeaconForPath(chrome_exe); } } // namespace installer diff --git a/chrome/installer/setup/install_worker.cc b/chrome/installer/setup/install_worker.cc index 5f7449f..7b40d98 100644 --- a/chrome/installer/setup/install_worker.cc +++ b/chrome/installer/setup/install_worker.cc @@ -61,7 +61,7 @@ namespace { // on user login by way of Active Setup. Increase this value if the work done // in setup_main.cc's handling of kConfigureUserSettings changes and should be // executed again for all users. -const wchar_t kActiveSetupVersion[] = L"24,0,0,0"; +const wchar_t kActiveSetupVersion[] = L"43,0,0,0"; // Although the UUID of the ChromeFrame class is used for the "current" value, // this is done only as a convenience; there is no need for the GUID of the Low |