Minor fixes of search engine dialog

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"
@@ skipping 135 matching lines @@
 
   // 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)
+  // 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) {
+    MessageLoop::current()->Quit();
     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.
   SearchEngineChoice* default_choice = NULL;
 
   // First, see if we have 4 logos to show (in which case we use small logos).
   // We show 4 logos when the default search engine the user has chosen is
   // not one of the first three prepopulated engines.
   if (template_urls.size() > 3) {
     for (search_engine_iter = template_urls.begin() + 3;
          search_engine_iter != template_urls.end();
          ++search_engine_iter) {
       if (default_search_engine == *search_engine_iter) {
         default_choice = new SearchEngineChoice(this, *search_engine_iter,
                                                 true);
       }
     }
   }
 
   // Now that we know what size the logos should be, create new search engine
-  // choices for the view:
+  // choices for the view.  If there are 2 search engines, only show 2
+  // choices; for 3 or more, show 3 (unless the default is not one of the
+  // top 3, in which case show 4).
   for (search_engine_iter = template_urls.begin();
-       search_engine_iter < template_urls.begin() + 3;
+       search_engine_iter < template_urls.begin() +
+           (template_urls.size() < 3 ? 2 : 3);
        ++search_engine_iter) {
     // Push first three engines into buttons:
     SearchEngineChoice* choice = new SearchEngineChoice(this,
         *search_engine_iter, default_choice != NULL);
     search_engine_choices_.push_back(choice);
     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) {
@@ skipping 128 matching lines @@
         kPanelHorizMargin + logo_padding, next_v_space, logo_width,
         logo_height);
 
     int next_h_space = search_engine_choices_[0]->GetView()->x() +
                        logo_width + logo_padding;
     search_engine_choices_[1]->SetChoiceViewBounds(
         next_h_space, next_v_space, logo_width, logo_height);
 
     next_h_space = search_engine_choices_[1]->GetView()->x() + logo_width +
                    logo_padding;
-    search_engine_choices_[2]->SetChoiceViewBounds(
-        next_h_space, next_v_space, logo_width, logo_height);
+    if (num_choices > 2) {
+      search_engine_choices_[2]->SetChoiceViewBounds(
+          next_h_space, next_v_space, logo_width, logo_height);
+    }
 
     if (num_choices > 3) {
       next_h_space = search_engine_choices_[2]->GetView()->x() + logo_width +
                      logo_padding;
       search_engine_choices_[3]->SetChoiceViewBounds(
           next_h_space, next_v_space, logo_width, logo_height);
     }
 
     next_v_space = search_engine_choices_[0]->GetView()->y() + logo_height +
                    kVertSpacing;
 
     // The buttons for search engine selection:
     int button_padding = logo_padding + logo_width / 2 - button_width / 2;
 
     search_engine_choices_[0]->SetBounds(kPanelHorizMargin + button_padding,
                                          next_v_space, button_width,
                                          button_height);
 
     next_h_space = search_engine_choices_[0]->x() + logo_width + logo_padding;
     search_engine_choices_[1]->SetBounds(next_h_space, next_v_space,
                                          button_width, button_height);
     next_h_space = search_engine_choices_[1]->x() + logo_width + logo_padding;
-    search_engine_choices_[2]->SetBounds(next_h_space, next_v_space,
-                                         button_width, button_height);
+    if (num_choices > 2) {
+      search_engine_choices_[2]->SetBounds(next_h_space, next_v_space,
+                                           button_width, button_height);
+    }
 
     if (num_choices > 3) {
       next_h_space = search_engine_choices_[2]->x() + logo_width +
                      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);
 }