Remove widgets related to restoring the default browser from uninstall view when default settings c…

chrome/browser/ui/views/uninstall_view.cc

Index: chrome/browser/ui/views/uninstall_view.cc
diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc
index 3c8e6326b465f81c2d64b983180799f135930262..8f15049090dab6556be683563549c8be664a04ab 100644
--- a/chrome/browser/ui/views/uninstall_view.cc
+++ b/chrome/browser/ui/views/uninstall_view.cc
@@ -69,10 +69,14 @@ void UninstallView::SetupControls() {
       l10n_util::GetStringUTF16(IDS_UNINSTALL_DELETE_PROFILE));
   layout->AddView(delete_profile_);
 
-  // Set default browser combo box
+  // Set default browser combo box. We assume here that if Chrome cannot
+  // be set automatically as default, neither can any other browser (for

[gab, 2012/06/07 19:13:28]

automatically --> programmatically

[motek., 2012/06/08 15:03:32]

Done.

+  // instance because the distribution or the OS doesn't permit that.

[gab, 2012/06/07 19:13:28]

"." => ")."

[gab, 2012/06/07 19:13:28]

-distribution (i.e. our distribution is not the blocker, the OS is, the check
for dist->CanSetDefault() is only there because if we can't set ourselves as
default there is no way we actually *are* the default)

[motek., 2012/06/08 15:03:32]

Done.

[motek., 2012/06/08 15:03:32]

Done + clarified a bit (because we indeed don't show it when distribution
settings say: "don't do it".

   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()) {
@@ -129,7 +133,7 @@ string16 UninstallView::GetDialogButtonLabel(ui::DialogButton button) const {
 
 void UninstallView::ButtonPressed(views::Button* sender,
                                   const views::Event& event) {
-  if (change_default_browser_ == sender) {
+  if (change_default_browser_ && change_default_browser_ == sender) {
     // Disable the browsers combobox if the user unchecks the checkbox.
     DCHECK(browsers_combo_);
     browsers_combo_->SetEnabled(change_default_browser_->checked());