diff options
| author | zturner@chromium.org <zturner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 18:52:54 +0000 |
|---|---|---|
| committer | zturner@chromium.org <zturner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-23 18:52:54 +0000 |
| commit | ee5396f60cbf0ff33cf5ca41e755d0ef5660946c (patch) | |
| tree | 7adac4c98db9799dc1300636edb7fec2e1b36927 /chrome/installer/util/google_chrome_sxs_distribution.cc | |
| parent | ad22af288a188fda9ae3da630c001e628b941857 (diff) | |
| download | chromium_src-ee5396f60cbf0ff33cf5ca41e755d0ef5660946c.zip chromium_src-ee5396f60cbf0ff33cf5ca41e755d0ef5660946c.tar.gz chromium_src-ee5396f60cbf0ff33cf5ca41e755d0ef5660946c.tar.bz2 | |
Automatically register canary GUIDs on install, but don't expose in-browser UI for registration.
This completes the work necessary to enable SxS distributions to be set as the default browser.
BUG=273248
TEST=
1) Uninstall all Chrome products (Canary, Stable, Chromium)
2) Install an official build of Chrome and set it as default browser.
3) Run setup.exe --chrome-sxs to install SxS.
4) Confirm that on startup, no set default infobar prompt is shown.
5) In chrome://settings, confirm that the text "This is a secondary installation..." is seen
6) In Windows "Choose default browser" utility, confirm that "Google Chrome Canary" is displayed and choose it.
7) Restart canary, and confirm that in chrome://settings it says "The default browser is currently Google Chrome."
8) Pin "Google Chrome Canary" tile to Start Screen, and confirm that launching Canary from Start Tile launches in Metro.
9) Run setup.exe --chrome-sxs --uninstall and confirm that the "Change default browser" combo box is displayed.
10) Choose option to change default browser to Firefox and Uninstall.
11) Using regedit, confirm that GUIDS for canary are gone.
12) Refresh settings in Windows Default browser utility, and confirm that Firefox is displayed.
13) In Windows Default Browser utility, set Google Chrome (this is the original, Stable channel installation) as default browser.
14) Run Chrome Stable and confirm in settings that it says "The default browser is currently Google Chrome"
pkasting: chrome/browser/ui/*
grt, gab: chrome/installer/*, chrome/browser/shell_integration_win.cc
jhawkins (optional): chrome/browser/ui/webui/*
Review URL: https://codereview.chromium.org/34053002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/util/google_chrome_sxs_distribution.cc')
| -rw-r--r-- | chrome/installer/util/google_chrome_sxs_distribution.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chrome/installer/util/google_chrome_sxs_distribution.cc b/chrome/installer/util/google_chrome_sxs_distribution.cc index 1925f30..f86e8ff 100644 --- a/chrome/installer/util/google_chrome_sxs_distribution.cc +++ b/chrome/installer/util/google_chrome_sxs_distribution.cc @@ -75,8 +75,9 @@ string16 GoogleChromeSxSDistribution::GetUninstallRegPath() { installer::kSxSSuffix); } -bool GoogleChromeSxSDistribution::CanSetAsDefault() { - return false; +BrowserDistribution::DefaultBrowserControlPolicy + GoogleChromeSxSDistribution::GetDefaultBrowserControlPolicy() { + return DEFAULT_BROWSER_OS_CONTROL_ONLY; } int GoogleChromeSxSDistribution::GetIconIndex(ShortcutType shortcut_type) { |