New first run sequence for Windows.

chrome/browser/views/first_run_search_engine_view.cc

 // Copyright (c) 2010 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/views/first_run_search_engine_view.h"
 
 #include <algorithm>
 #include <map>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/i18n/rtl.h"
 #include "base/time.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
-#include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "gfx/font.h"
 #include "grit/browser_resources.h"
 #include "grit/chromium_strings.h"
 #include "grit/google_chrome_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
 #include "views/controls/button/button.h"
 #include "views/controls/image_view.h"
@@ skipping 120 matching lines @@
     return choice_view_->GetPreferredSize().height();
   }
 }
 
 void SearchEngineChoice::SetChoiceViewBounds(int x, int y, int width,
                                              int height) {
   choice_view_->SetBounds(x, y, width, height);
 }
 
 FirstRunSearchEngineView::FirstRunSearchEngineView(
-    SearchEngineSelectionObserver* observer, Profile* profile, bool randomize)
+    Profile* profile, bool randomize)
     : background_image_(NULL),
       profile_(profile),
-      observer_(observer),
       text_direction_is_rtl_(base::i18n::IsRTL()),
       randomize_(randomize) {
-  DCHECK(observer);
   // 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.
   search_engines_model_ = profile_->GetTemplateURLModel();
   if (search_engines_model_) {
     DCHECK(!search_engines_model_->loaded());
     search_engines_model_->AddObserver(this);
     search_engines_model_->Load();
   } else {
     NOTREACHED();
   }
   SetupControls();
 }
 
 FirstRunSearchEngineView::~FirstRunSearchEngineView() {
   search_engines_model_->RemoveObserver(this);
 }
 
 void FirstRunSearchEngineView::ButtonPressed(views::Button* sender,
                                              const views::Event& event) {
   SearchEngineChoice* choice = static_cast<SearchEngineChoice*>(sender);
-  profile_->GetTemplateURLModel()->SetSearchEngineDialogSlot(
-      choice->slot());
-  observer_->SearchEngineChosen(choice->GetSearchEngine());
+  TemplateURLModel* template_url_model = profile_->GetTemplateURLModel();
+  DCHECK(template_url_model);
+  template_url_model->SetSearchEngineDialogSlot(choice->slot());
+  const TemplateURL* default_search = choice->GetSearchEngine();
+  if (default_search)
+    template_url_model->SetDefaultSearchProvider(default_search);
+
+  MessageLoop::current()->Quit();
 }
 
 void FirstRunSearchEngineView::OnTemplateURLModelChanged() {
   using views::ImageView;
 
   // 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.
   search_engines_model_->RemoveObserver(this);
 
   // Add search engines in search_engines_model_ to buttons list.  The
   // first three will always be from prepopulated data.
   std::vector<const TemplateURL*> template_urls =
       search_engines_model_->GetTemplateURLs();
 
   // If we have fewer than three search engines, signal that the search engine
   // experiment is over, leaving imported default search engine setting intact.
-  if (template_urls.size() < 3) {
-    observer_->SearchEngineChosen(NULL);
+  if (template_urls.size() < 3)
     return;
-  }
 
   std::vector<const TemplateURL*>::iterator search_engine_iter;
 
   // Is user's default search engine included in first three prepopulated
   // set?  If not, we need to expand the dialog to include a fourth engine.
   const TemplateURL* default_search_engine =
       search_engines_model_->GetDefaultSearchProvider();
   // If the user's default choice is not in the first three search engines
   // in template_urls, store it in |default_choice| and provide it as a
   // fourth option.
@@ skipping 197 matching lines @@
                      logo_padding;
       search_engine_choices_[3]->SetBounds(next_h_space, next_v_space,
                                            button_width, button_height);
     }
   }  // if (search_engine_choices.size() > 0)
 }
 
 std::wstring FirstRunSearchEngineView::GetWindowTitle() const {
   return l10n_util::GetString(IDS_FIRSTRUN_DLG_TITLE);
 }