summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormotek@chromium.org <motek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-08 20:22:42 +0000
committermotek@chromium.org <motek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-08 20:22:42 +0000
commit7cad1ddbec2fa7278d41631901fdbd06324797fd (patch)
tree48a1a73ecb3c2554e78ab3876079ac749c678081
parentbf9dc973eef8b34e4ccc2d0a2f58f245772a36bc (diff)
downloadchromium_src-7cad1ddbec2fa7278d41631901fdbd06324797fd.zip
chromium_src-7cad1ddbec2fa7278d41631901fdbd06324797fd.tar.gz
chromium_src-7cad1ddbec2fa7278d41631901fdbd06324797fd.tar.bz2
Remove widgets related to restoring the default browser from uninstall view when default settings cannot be restored.
BUG=123320 TEST=N/A Review URL: https://chromiumcodereview.appspot.com/10453048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141270 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/ui/views/uninstall_view.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc
index 3c8e632..808d245 100644
--- a/chrome/browser/ui/views/uninstall_view.cc
+++ b/chrome/browser/ui/views/uninstall_view.cc
@@ -69,10 +69,15 @@ void UninstallView::SetupControls() {
l10n_util::GetStringUTF16(IDS_UNINSTALL_DELETE_PROFILE));
layout->AddView(delete_profile_);
- // Set default browser combo box
+ // Set default browser combo box. If the default should not or cannot be
+ // changed, widgets are not shown. We assume here that if Chrome cannot
+ // be set programatically as default, neither can any other browser (for
+ // instance because the OS doesn't permit that).
BrowserDistribution* dist = BrowserDistribution::GetDistribution();
if (dist->CanSetAsDefault() &&
- ShellIntegration::IsDefaultBrowser()) {
+ ShellIntegration::IsDefaultBrowser() &&
+ (ShellIntegration::CanSetAsDefaultBrowser() !=
+ ShellIntegration::SET_DEFAULT_INTERACTIVE)) {
browsers_.reset(new BrowsersMap());
ShellUtil::GetRegisteredBrowsers(dist, browsers_.get());
if (!browsers_->empty()) {