Revert EnableClose() removal and related crash fixes. I don't understand the crashes here, and th...

chrome/browser/ui/views/first_run_search_engine_view.cc

 // Copyright (c) 2011 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/first_run_search_engine_view.h"
 
 #include <algorithm>
 #include <map>
 #include <vector>
 
@@ skipping 46 matching lines @@
                         bool randomize_search_engine_experiment) {
   // If the default search is managed via policy, we don't ask the user to
   // choose.
   TemplateURLService* model = TemplateURLServiceFactory::GetForProfile(profile);
   if (!FirstRun::ShouldShowSearchEngineSelector(model))
     return;
 
   views::Widget* window = views::Widget::CreateWindow(
       new FirstRunSearchEngineView(
           profile, randomize_search_engine_experiment));
+  DCHECK(window);
+
   window->SetAlwaysOnTop(true);
   window->Show();
   views::AcceleratorHandler accelerator_handler;
   MessageLoopForUI::current()->RunWithDispatcher(&accelerator_handler);
+  window->Close();
 }
 
 }  // namespace first_run
 
 SearchEngineChoice::SearchEngineChoice(views::ButtonListener* listener,
                                        const TemplateURL* search_engine,
                                        bool use_small_logos)
     : NativeTextButton(
           listener,
           UTF16ToWide(l10n_util::GetStringUTF16(IDS_FR_SEARCH_CHOOSE))),
@@ skipping 52 matching lines @@
   }
 }
 
 void SearchEngineChoice::SetChoiceViewBounds(int x, int y, int width,
                                              int height) {
   choice_view_->SetBounds(x, y, width, height);
 }
 
 FirstRunSearchEngineView::FirstRunSearchEngineView(Profile* profile,
                                                    bool randomize)
-    : views::ClientView(NULL, NULL),
-      background_image_(NULL),
+    : background_image_(NULL),
       template_url_service_(TemplateURLServiceFactory::GetForProfile(profile)),
       text_direction_is_rtl_(base::i18n::IsRTL()),
+      template_url_service_loaded_(false),
       added_to_view_hierarchy_(false),
-      randomize_(randomize),
-      user_chosen_engine_(false),
-      fallback_choice_(NULL),
-      quit_on_closing_(true) {
+      randomize_(randomize) {
   // Don't show ourselves until all the search engines have loaded from
   // the profile -- otherwise we have nothing to show.
   SetVisible(false);
 
-  // Start loading the search engines for the given profile. The service is
-  // already loaded in tests.
+  // Start loading the search engines for the given profile.
   DCHECK(template_url_service_);
-  if (!template_url_service_->loaded()) {
-    template_url_service_->AddObserver(this);
-    template_url_service_->Load();
-  }
+  DCHECK(!template_url_service_->loaded());
+  template_url_service_->AddObserver(this);
+  template_url_service_->Load();
 }
 
 FirstRunSearchEngineView::~FirstRunSearchEngineView() {
   template_url_service_->RemoveObserver(this);
 }
 
 string16 FirstRunSearchEngineView::GetWindowTitle() const {
   return l10n_util::GetStringUTF16(IDS_FIRSTRUN_DLG_TITLE);
 }
 
-views::View* FirstRunSearchEngineView::GetContentsView() {
-  return this;
-}
-
-views::ClientView* FirstRunSearchEngineView::CreateClientView(
-    views::Widget* widget) {
-  return this;
-}
-
-void FirstRunSearchEngineView::WindowClosing() {
-  // If the window is closed by clicking the close button, we default to the
-  // engine in the first slot.
-  if (!user_chosen_engine_)
-    ChooseSearchEngine(fallback_choice_);
-  if (quit_on_closing_)
-    MessageLoop::current()->Quit();
-}
-
-views::Widget* FirstRunSearchEngineView::GetWidget() {
-  return View::GetWidget();
-}
-
-const views::Widget* FirstRunSearchEngineView::GetWidget() const {
-  return View::GetWidget();
-}
-
-bool FirstRunSearchEngineView::CanClose() {
-  // We need a valid search engine to set as default, so if the user tries to
-  // close the window before the template URL service is loaded, we must prevent
-  // this from happening.
-  return fallback_choice_ != NULL;
-}
-
 void FirstRunSearchEngineView::ButtonPressed(views::Button* sender,
                                              const views::Event& event) {
-  ChooseSearchEngine(static_cast<SearchEngineChoice*>(sender));
-  GetWidget()->Close();
-  // This will call through to WindowClosing() above and will quit the message
-  // loop.
+  SearchEngineChoice* choice = static_cast<SearchEngineChoice*>(sender);
+  DCHECK(template_url_service_);
+  template_url_service_->SetSearchEngineDialogSlot(choice->slot());
+  const TemplateURL* default_search = choice->GetSearchEngine();
+  if (default_search)
+    template_url_service_->SetDefaultSearchProvider(default_search);
+
+  MessageLoop::current()->Quit();
 }
 
 void FirstRunSearchEngineView::OnPaint(gfx::Canvas* canvas) {
   // Fill in behind the background image with the standard gray toolbar color.
   canvas->FillRect(GetThemeProvider()->GetColor(ThemeService::COLOR_TOOLBAR),
                    gfx::Rect(0, 0, width(), background_image_->height()));
   // The rest of the dialog background should be white.
   DCHECK(height() > background_image_->height());
   canvas->FillRect(SK_ColorWHITE,
                    gfx::Rect(0, background_image_->height(), width(),
                              height() - background_image_->height()));
 }
 
 void FirstRunSearchEngineView::OnTemplateURLServiceChanged() {
   // We only watch the search engine model change once, on load.  Remove
   // observer so we don't try to redraw if engines change under us.
   template_url_service_->RemoveObserver(this);
+
+  template_url_service_loaded_ = true;
   AddSearchEnginesIfPossible();
 }
 
 gfx::Size FirstRunSearchEngineView::GetPreferredSize() {
   return views::Widget::GetLocalizedContentsSize(
       IDS_FIRSTRUN_SEARCH_ENGINE_SELECTION_WIDTH_CHARS,
       IDS_FIRSTRUN_SEARCH_ENGINE_SELECTION_HEIGHT_LINES);
 }
 
 void FirstRunSearchEngineView::Layout() {
+  // Disable the close button.
+  GetWidget()->EnableClose(false);
+
   gfx::Size pref_size = background_image_->GetPreferredSize();
   background_image_->SetBounds(0, 0, GetPreferredSize().width(),
                                pref_size.height());
 
   // General vertical spacing between elements:
   const int kVertSpacing = 8;
   // Percentage of vertical space around logos to use for upper padding.
   const double kUpperPaddingPercent = 0.4;
 
   int num_choices = search_engine_choices_.size();
@@ skipping 139 matching lines @@
     AddSearchEnginesIfPossible();
   }
 }
 
 void FirstRunSearchEngineView::GetAccessibleState(
     ui::AccessibleViewState* state) {
   state->role = ui::AccessibilityTypes::ROLE_ALERT;
 }
 
 void FirstRunSearchEngineView::AddSearchEnginesIfPossible() {
-  if (!template_url_service_->loaded() || !added_to_view_hierarchy_)
+  if (!template_url_service_loaded_ || !added_to_view_hierarchy_)
     return;
 
   // Add search engines in template_url_service_ to buttons list.  The
   // first three will always be from prepopulated data.
   std::vector<const TemplateURL*> template_urls =
       template_url_service_->GetTemplateURLs();
 
   // If we have fewer than two search engines, end search engine dialog
   // immediately, leaving imported default search engine setting intact.
   if (template_urls.size() < 2) {
@@ skipping 41 matching lines @@
     AddChildView(choice->GetView());  // The logo or text view.
     AddChildView(choice);  // The button associated with the choice.
   }
   // Push the default choice to the fourth position.
   if (default_choice) {
     search_engine_choices_.push_back(default_choice);
     AddChildView(default_choice->GetView());  // The logo or text view.
     AddChildView(default_choice);  // The button associated with the choice.
   }
 
-  // It is critically important that this line happens before randomization is
-  // done below.
-  fallback_choice_ = search_engine_choices_.front();
-
   // Randomize order of logos if option has been set.
   if (randomize_) {
     std::random_shuffle(search_engine_choices_.begin(),
                         search_engine_choices_.end(),
                         base::RandGenerator);
     // Assign to each choice the position in which it is shown on the screen.
     std::vector<SearchEngineChoice*>::iterator it;
     int slot = 0;
     for (it = search_engine_choices_.begin();
          it != search_engine_choices_.end();
@@ skipping 18 matching lines @@
       (*it)->SetText((*it)->GetSearchEngine()->short_name());
     }
   }
 
   // This will tell screenreaders that they should read the full text
   // of this dialog to the user now (rather than waiting for the user
   // to explore it).
   GetWidget()->NotifyAccessibilityEvent(
       this, ui::AccessibilityTypes::EVENT_ALERT, true);
 }
-
-void FirstRunSearchEngineView::ChooseSearchEngine(SearchEngineChoice* choice) {
-  user_chosen_engine_ = true;
-  DCHECK(choice && template_url_service_);
-  template_url_service_->SetSearchEngineDialogSlot(choice->slot());
-  const TemplateURL* default_search = choice->GetSearchEngine();
-  if (default_search)
-    template_url_service_->SetDefaultSearchProvider(default_search);
-}