Merge 113149 - Reland 112770, but with test disabled.

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 122 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)
-    : background_image_(NULL),
+    : views::ClientView(NULL, NULL),
+      background_image_(NULL),
       template_url_service_(TemplateURLServiceFactory::GetForProfile(profile)),
       text_direction_is_rtl_(base::i18n::IsRTL()),
       added_to_view_hierarchy_(false),
       randomize_(randomize),
       user_chosen_engine_(false),
       fallback_choice_(NULL),
       quit_on_closing_(true) {
   // 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.
   DCHECK(template_url_service_);
   if (!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.
 }
 
 void FirstRunSearchEngineView::OnPaint(gfx::Canvas* canvas) {
   // Fill in behind the background image with the standard gray toolbar color.
@@ skipping 279 matching lines @@
 
   // 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(template_url_service_);
+  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);
 }