New first run sequence for Windows.

chrome/browser/views/first_run_search_engine_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_VIEWS_FIRST_RUN_SEARCH_ENGINE_VIEW_H_
 #define CHROME_BROWSER_VIEWS_FIRST_RUN_SEARCH_ENGINE_VIEW_H_
 
 #include <vector>
 
-#include "chrome/browser/views/keyword_editor_view.h"
+#include "chrome/browser/search_engines/template_url_model.h"
 #include "gfx/size.h"
 #include "views/controls/button/native_button.h"
 #include "views/view.h"
 #include "views/window/window_delegate.h"
 
 namespace views {
 class ButtonListener;
 class ImageView;
 class Label;
 class Separator;
@@ skipping 45 matching lines @@
 
   // Data for the search engine held here.
   const TemplateURL* search_engine_;
 
   // Used for UX testing. Gives slot in which search engine was shown.
   int slot_;
 
   DISALLOW_COPY_AND_ASSIGN(SearchEngineChoice);
 };
 
-// This class receives a callback when the search engine dialog closes.
-class SearchEngineSelectionObserver {
- public:
-  virtual ~SearchEngineSelectionObserver() {}
-  // Called when the user has chosen a search engine.
-  virtual void SearchEngineChosen(const TemplateURL* default_search) = 0;
-};
-
 // This class displays a large search engine choice dialog view during
 // initial first run import.
 class FirstRunSearchEngineView
     : public views::View,
       public views::ButtonListener,
       public views::WindowDelegate,
       public TemplateURLModelObserver {
  public:
-  // |observer| is the FirstRunView that waits for us to pass back a search
-  // engine choice.
-  // |profile| allows us to get the set of imported search engines, and
-  // display the KeywordEditorView on demand.
+  // |profile| allows us to get the set of imported search engines.
   // |randomize| is true if logos are to be displayed in random order.
-  FirstRunSearchEngineView(SearchEngineSelectionObserver* observer,
-                           Profile* profile, bool randomize);
+  FirstRunSearchEngineView(Profile* profile, bool randomize);
 
   virtual ~FirstRunSearchEngineView();
 
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize();
   virtual void Layout();
 
   // Overridden from views::WindowDelegate:
   virtual std::wstring GetWindowTitle() const;
   views::View* GetContentsView() { return this; }
@@ skipping 19 matching lines @@
 
   // One for each search engine choice offered, either three or four.
   std::vector<SearchEngineChoice*> search_engine_choices_;
 
   // If logos are to be displayed in random order. Used for UX testing.
   bool randomize_;
 
   // The profile associated with this import process.
   Profile* profile_;
 
-  // Gets called back when one of the choice buttons is pressed.
-  SearchEngineSelectionObserver* observer_;
-
   bool text_direction_is_rtl_;
 
   // Image of browser search box with grey background and bubble arrow.
   views::ImageView* background_image_;
 
   // UI elements:
   views::Label* title_label_;
   views::Label* text_label_;
 
   DISALLOW_COPY_AND_ASSIGN(FirstRunSearchEngineView);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_FIRST_RUN_SEARCH_ENGINE_VIEW_H_