ui/gfx: Convert Canvas::FillRectInt() to use gfx::Rect.

chrome/browser/ui/views/default_search_view.cc

 // Copyright (c) 2011 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/ui/views/default_search_view.h"
 
 #include <string>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
+#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
-#include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/message_box_flags.h"
-#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
 #include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
+#include "views/widget/widget.h"
 #include "views/window/dialog_client_view.h"
-#include "views/widget/widget.h"
 
 namespace {
 
 // Returns a short name and logo resource id for the given host.
 void GetShortNameAndLogoId(PrefService* prefs,
                            const TemplateURL* turl,
                            std::wstring* short_name,
                            int* logo_id) {
   DCHECK(prefs);
   DCHECK(turl);
@@ skipping 84 matching lines @@
   } else {
     delete proposed_default_turl;
   }
 }
 
 DefaultSearchView::~DefaultSearchView() {
 }
 
 void DefaultSearchView::OnPaint(gfx::Canvas* canvas) {
   // Fill in behind the background image with the standard gray toolbar color.
-  canvas->FillRectInt(GetThemeProvider()->GetColor(ThemeService::COLOR_TOOLBAR),
-                      0, 0, width(), background_image_->height());
+  canvas->FillRect(GetThemeProvider()->GetColor(ThemeService::COLOR_TOOLBAR),
+                   gfx::Rect(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());
+  canvas->FillRect(SK_ColorWHITE,
+                   gfx::Rect(0, background_image_->height(), width(),
+                             height() - background_image_->height()));
 }
 
 void DefaultSearchView::ButtonPressed(views::Button* sender,
                                       const views::Event& event) {
   views::DialogClientView* client = GetDialogClientView();
   if (sender == proposed_provider_button_)
     client->AcceptWindow();
   else
     client->CancelWindow();
 }
@@ skipping 151 matching lines @@
       this,
       IDS_DEFAULT_SEARCH_PROMPT_CURRENT,
       default_short_name);
   layout->AddView(default_provider_button_);
   proposed_provider_button_ = CreateProviderChoiceButton(
       this,
       IDS_DEFAULT_SEARCH_PROMPT_PROPOSED,
       proposed_short_name);
   layout->AddView(proposed_provider_button_);
 }