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

chrome/browser/ui/views/uninstall_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/uninstall_view.h"
 
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
@@ skipping 51 matching lines @@
   ++column_set_id;
   column_set = layout->AddColumnSet(column_set_id);
   column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
   column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                         GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, column_set_id);
   delete_profile_ = new views::Checkbox(
       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() !=

[Peter Kasting, 2012/06/08 18:37:48]

Nit: I'd put parens around this condition since it's split across multiple
lines.

[motek., 2012/06/08 18:49:18]

Done.

+          ShellIntegration::SET_DEFAULT_INTERACTIVE) {
     browsers_.reset(new BrowsersMap());
     ShellUtil::GetRegisteredBrowsers(dist, browsers_.get());
     if (!browsers_->empty()) {
       layout->AddPaddingRow(0, views::kRelatedControlVerticalSpacing);
 
       ++column_set_id;
       column_set = layout->AddColumnSet(column_set_id);
       column_set->AddPaddingColumn(0, views::kRelatedControlHorizontalSpacing);
       column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
                             GridLayout::USE_PREF, 0, 0);
@@ skipping 36 matching lines @@
 string16 UninstallView::GetDialogButtonLabel(ui::DialogButton button) const {
   // We only want to give custom name to OK button - 'Uninstall'. Cancel
   // button remains same.
   if (button == ui::DIALOG_BUTTON_OK)
     return l10n_util::GetStringUTF16(IDS_UNINSTALL_BUTTON_TEXT);
   return string16();
 }
 
 void UninstallView::ButtonPressed(views::Button* sender,
                                   const views::Event& event) {
-  if (change_default_browser_ == sender) {
+  if (change_default_browser_ && change_default_browser_ == sender) {

[Peter Kasting, 2012/06/08 18:37:48]

Nit: Why is this necessary?  You won't get called with |sender| == NULL so the
existing conditional already handles this.

[motek., 2012/06/08 18:49:18]

Wasn't sure of that. And since I am pathologically defensive... Removed.

     // Disable the browsers combobox if the user unchecks the checkbox.
     DCHECK(browsers_combo_);
     browsers_combo_->SetEnabled(change_default_browser_->checked());
   }
 }
 
 string16 UninstallView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_UNINSTALL_CHROME);
 }
 
@@ skipping 17 matching lines @@
 
 int ShowUninstallBrowserPrompt() {
   int result = content::RESULT_CODE_NORMAL_EXIT;
   views::Widget::CreateWindow(new UninstallView(&result))->Show();
   views::AcceleratorHandler accelerator_handler;
   MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
   return result;
 }
 
 }  // namespace browser