Reland: Remove some dead app host code.

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/message_loop.h"
 #include "base/process/launch.h"
 #include "base/run_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/ui/uninstall_browser_prompt.h"
 #include "chrome/common/chrome_result_codes.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "chrome/installer/util/shell_util.h"
 #include "grit/chromium_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 #include "ui/views/widget/widget.h"
 
 UninstallView::UninstallView(int* user_selection,
-                             const base::Closure& quit_closure,
-                             bool show_delete_profile)
+                             const base::Closure& quit_closure)
     : confirm_label_(NULL),
-      show_delete_profile_(show_delete_profile),
       delete_profile_(NULL),
       change_default_browser_(NULL),
       browsers_combo_(NULL),
       user_selection_(*user_selection),
       quit_closure_(quit_closure) {
   SetupControls();
 }
 
 UninstallView::~UninstallView() {
   // Exit the message loop we were started with so that uninstall can continue.
@@ skipping 17 matching lines @@
                         GridLayout::USE_PREF, 0, 0);
   layout->StartRow(0, column_set_id);
   confirm_label_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_UNINSTALL_VERIFY));
   confirm_label_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
   layout->AddView(confirm_label_);
 
   layout->AddPaddingRow(0, views::kUnrelatedControlVerticalSpacing);
 
   // The "delete profile" check box.
-  if (show_delete_profile_) {
-    ++column_set_id;
-    column_set = layout->AddColumnSet(column_set_id);
-    column_set->AddPaddingColumn(0, views::kPanelHorizIndentation);
-    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_);
-  }
+  ++column_set_id;
+  column_set = layout->AddColumnSet(column_set_id);
+  column_set->AddPaddingColumn(0, views::kPanelHorizIndentation);
+  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. 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->GetDefaultBrowserControlPolicy() !=
           BrowserDistribution::DEFAULT_BROWSER_UNSUPPORTED &&
       ShellIntegration::GetDefaultBrowser() == ShellIntegration::IS_DEFAULT &&
       (ShellIntegration::CanSetAsDefaultBrowser() !=
@@ skipping 20 matching lines @@
       layout->AddView(browsers_combo_);
       browsers_combo_->SetEnabled(false);
     }
   }
 
   layout->AddPaddingRow(0, views::kRelatedControlSmallVerticalSpacing);
 }
 
 bool UninstallView::Accept() {
   user_selection_ = content::RESULT_CODE_NORMAL_EXIT;
-  if (show_delete_profile_ && delete_profile_->checked())
+  if (delete_profile_->checked())
     user_selection_ = chrome::RESULT_CODE_UNINSTALL_DELETE_PROFILE;
   if (change_default_browser_ && change_default_browser_->checked()) {
     BrowsersMap::const_iterator i = browsers_->begin();
     std::advance(i, browsers_combo_->selected_index());
     base::LaunchOptions options;
     options.start_hidden = true;
     base::LaunchProcess(i->second, options, NULL);
   }
   return true;
 }
@@ skipping 31 matching lines @@
 
 base::string16 UninstallView::GetItemAt(int index) {
   DCHECK_LT(index, static_cast<int>(browsers_->size()));
   BrowsersMap::const_iterator i = browsers_->begin();
   std::advance(i, index);
   return i->first;
 }
 
 namespace chrome {
 
-int ShowUninstallBrowserPrompt(bool show_delete_profile) {
+int ShowUninstallBrowserPrompt() {
   DCHECK(base::MessageLoopForUI::IsCurrent());
   int result = content::RESULT_CODE_NORMAL_EXIT;
 
   // Take a reference on g_browser_process while showing the dialog. This is
   // done because the dialog uses the views framework which may increment
   // and decrement the module ref count during the course of displaying UI and
   // this code can be called while the module refcount is still at 0.
   // Note that this reference is never released, as this code is shown on a path
   // that immediately exits Chrome anyway.
   // See http://crbug.com/241366 for details.
   g_browser_process->AddRefModule();
 
   base::RunLoop run_loop;
   UninstallView* view = new UninstallView(&result,
-                                          run_loop.QuitClosure(),
-                                          show_delete_profile);
+                                          run_loop.QuitClosure());
   views::DialogDelegate::CreateDialogWidget(view, NULL, NULL)->Show();
   run_loop.Run();
   return result;
 }
 
 }  // namespace chrome