Allow randomized search engines in selection dialog....

chrome/browser/views/first_run_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_view.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/win_util.h"
 #include "chrome/browser/importer/importer.h"
@@ skipping 22 matching lines @@
 // Adds a bullet glyph to a string.
 std::wstring AddBullet(const std::wstring& text) {
   std::wstring btext(L" " + text);
   return btext.insert(0, 1, L'\u2022');
 }
 
 }  // namespace
 
 FirstRunView::FirstRunView(Profile* profile, bool homepage_defined,
                            int import_items, int dont_import_items,
-                           bool search_engine_experiment)
+                           bool search_engine_experiment,
+                           bool randomize_search_engine_experiment)
     : FirstRunViewBase(profile, homepage_defined, import_items,
-                       dont_import_items, search_engine_experiment),
+                       dont_import_items, search_engine_experiment,
+                       randomize_search_engine_experiment),
       welcome_label_(NULL),
       actions_label_(NULL),
       actions_import_(NULL),
       actions_shorcuts_(NULL),
       customize_link_(NULL),
       customize_selected_(false),
       accepted_(false) {
   importer_host_ = new ImporterHost();
   SetupControls();
 }
@@ skipping 123 matching lines @@
   views::Window::CreateChromeWindow(
       window()->GetNativeWindow(),
       gfx::Rect(),
       new FirstRunCustomizeView(profile_,
                                 importer_host_,
                                 this,
                                 default_browser_ && default_browser_->checked(),
                                 homepage_defined_,
                                 import_items_,
                                 dont_import_items_,
-                                search_engine_experiment_))->Show();
+                                search_engine_experiment_,
+                                randomize_search_engine_experiment_))->Show();
 }
 
-void FirstRunView::OpenSearchEngineDialog() {
+void FirstRunView::OpenSearchEngineDialog(bool randomize) {
   views::Window::CreateChromeWindow(
       window()->GetNativeWindow(),
       gfx::Rect(),
       new FirstRunSearchEngineView(this,
-                                   profile_))->Show();
+                                   profile_,
+                                   randomize))->Show();
 }
 
 void FirstRunView::LinkActivated(views::Link* source, int event_flags) {
   OpenCustomizeDialog();
 }
 
 std::wstring FirstRunView::GetWindowTitle() const {
   return l10n_util::GetString(IDS_FIRSTRUN_DLG_TITLE);
 }
 
@@ skipping 14 matching lines @@
   // Index 0 is the default browser.
   FirstRun::ImportSettings(profile_,
       importer_host_->GetSourceProfileInfoAt(0).browser_type,
       GetImportItems(), window()->GetNativeWindow());
   UserMetrics::RecordAction(UserMetricsAction("FirstRunDef_Accept"), profile_);
   if (default_browser_ && default_browser_->checked())
     SetDefaultBrowser();
 
   // Launch the search engine dialog.
   if (search_engine_experiment_) {
-    OpenSearchEngineDialog();
+    OpenSearchEngineDialog(randomize_search_engine_experiment_);
     // Leave without shutting down; we'll observe the search engine dialog and
     // shut down after it closes.
     return false;
   }
 
   accepted_ = true;
   FirstRunComplete();
   MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
   return true;
 }
 
 bool FirstRunView::Cancel() {
   UserMetrics::RecordAction(UserMetricsAction("FirstRunDef_Cancel"), profile_);
   MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
   return true;
 }
 
 // Notification from the customize dialog that the user accepted. Since all
 // the work is done there we have nothing else to do.
 void FirstRunView::CustomizeAccepted() {
   if (search_engine_experiment_) {
-    OpenSearchEngineDialog();
+    OpenSearchEngineDialog(randomize_search_engine_experiment_);
     // We'll shut down after search engine has been chosen.
     return;
   }
   accepted_ = true;
   FirstRunComplete();
   window()->Close();
   MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 }
 
 // Notification from the customize dialog that the user cancelled.
 void FirstRunView::CustomizeCanceled() {
   UserMetrics::RecordAction(UserMetricsAction("FirstRunCustom_Cancel"),
                             profile_);
 }
 
 void FirstRunView::SearchEngineChosen(const TemplateURL* default_search) {
   // default_search may be NULL if the user closed the search view without
   // making a choice, or if a choice was made through the KeywordEditor.
   if (default_search)
     profile_->GetTemplateURLModel()->SetDefaultSearchProvider(default_search);
   accepted_ = true;
   FirstRunComplete();
   window()->Close();
   MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
 }