Change search engine dialog image to be transparent, and use this image flipp...

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_prepopulate_data.h"
+#include "gfx/canvas.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"
 #include "views/controls/label.h"
@@ skipping 107 matching lines @@
   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::Paint(gfx::Canvas* canvas) {
+  // Fill in behind the background image with the standard gray toolbar color.
+  canvas->FillRectInt(SkColorSetRGB(237, 238, 237), 0, 0, width(),
+                      background_image_->height());
+  // The rest of the dialog background should be white.
+  DCHECK(height() > background_image_->height());
+  canvas->FillRectInt(SK_ColorWHITE, 0, background_image_->height(), width(),
+                      height() - background_image_->height());
+}
+
 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 =
@@ skipping 82 matching lines @@
 }
 
 void FirstRunSearchEngineView::SetupControls() {
   using views::Background;
   using views::ImageView;
   using views::Label;
   using views::NativeButton;
 
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   background_image_ = new views::ImageView();
+  background_image_->SetImage(rb.GetBitmapNamed(IDR_SEARCH_ENGINE_DIALOG_TOP));
+  background_image_->EnableCanvasFlippingForRTLUI(true);
   if (text_direction_is_rtl_) {
-    background_image_->SetImage(rb.GetBitmapNamed(
-        IDR_SEARCH_ENGINE_DIALOG_TOP_RTL));
+    background_image_->SetHorizontalAlignment(ImageView::LEADING);
   } else {
-    background_image_->SetImage(rb.GetBitmapNamed(
-        IDR_SEARCH_ENGINE_DIALOG_TOP));
+    background_image_->SetHorizontalAlignment(ImageView::TRAILING);
   }
-  background_image_->SetHorizontalAlignment(ImageView::TRAILING);
+
   AddChildView(background_image_);
 
   int label_width = GetPreferredSize().width() - 2 * kPanelHorizMargin;
 
-  set_background(Background::CreateSolidBackground(SK_ColorWHITE));
-
   // Add title and text asking the user to choose a search engine:
   title_label_ = new Label(l10n_util::GetString(
       IDS_FR_SEARCH_MAIN_LABEL));
   title_label_->SetColor(SK_ColorBLACK);
   title_label_->SetFont(title_label_->font().DeriveFont(3, gfx::Font::BOLD));
   title_label_->SetMultiLine(true);
   title_label_->SetHorizontalAlignment(Label::ALIGN_LEFT);
   title_label_->SizeToFit(label_width);
   AddChildView(title_label_);
 
@@ skipping 112 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);
 }