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

chrome/browser/ui/views/frame/browser_frame_aura.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/frame/browser_frame_aura.h"
 
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view_aura.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "grit/theme_resources_standard.h"
@@ skipping 56 matching lines @@
 
   // Split our canvas out so we can mask out the corners of the toolbar
   // without masking out the frame.
   canvas->SaveLayerAlpha(
       255, gfx::Rect(x - views::NonClientFrameView::kClientEdgeThickness,
                      y,
                      w + views::NonClientFrameView::kClientEdgeThickness * 3,
                      h));
   canvas->GetSkCanvas()->drawARGB(0, 255, 255, 255, SkXfermode::kClear_Mode);
 
-  SkColor theme_toolbar_color =
-      tp->GetColor(ThemeService::COLOR_TOOLBAR);
-  canvas->FillRectInt(theme_toolbar_color, x, bottom_y, w, bottom_edge_height);
+  SkColor theme_toolbar_color = tp->GetColor(ThemeService::COLOR_TOOLBAR);
+  canvas->FillRect(theme_toolbar_color,
+                   gfx::Rect(x, bottom_y, w, bottom_edge_height));
 
   // Tile the toolbar image starting at the frame edge on the left and where the
   // horizontal tabstrip is (or would be) on the top.
   SkBitmap* theme_toolbar = tp->GetBitmapNamed(IDR_THEME_TOOLBAR);
   canvas->TileImageInt(*theme_toolbar, x,
                        bottom_y, x,
                        bottom_y, w, theme_toolbar->height());
 
   // Draw rounded corners for the tab.
   SkBitmap* toolbar_left_mask =
@@ skipping 44 matching lines @@
 
   SkBitmap* toolbar_right = tp->GetBitmapNamed(IDR_CONTENT_TOP_RIGHT_CORNER);
   canvas->DrawBitmapInt(*toolbar_right, 0, 0, toolbar_right->width(),
       split_point, right_x, y, toolbar_right->width(), split_point, false);
   canvas->DrawBitmapInt(*toolbar_right, 0,
       toolbar_right->height() - bottom_edge_height, toolbar_right->width(),
       bottom_edge_height, right_x, bottom_y, toolbar_right->width(),
       bottom_edge_height, false);
 
   // Draw the content/toolbar separator.
-  canvas->FillRectInt(
+  canvas->FillRect(
       ResourceBundle::toolbar_separator_color,
-      x + views::NonClientFrameView::kClientEdgeThickness,
-      toolbar_bounds.bottom() - views::NonClientFrameView::kClientEdgeThickness,
-      w - (2 * views::NonClientFrameView::kClientEdgeThickness),
-      views::NonClientFrameView::kClientEdgeThickness);
+      gfx::Rect(
+          x + views::NonClientFrameView::kClientEdgeThickness,
+          toolbar_bounds.bottom() - views::NonClientFrameView::kClientEdgeThickness,
+          w - (2 * views::NonClientFrameView::kClientEdgeThickness),
+          views::NonClientFrameView::kClientEdgeThickness));
 }
 
 }  // namespace
 
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, public:
 
 BrowserFrameAura::BrowserFrameAura(BrowserFrame* browser_frame,
                                    BrowserView* browser_view)
     : views::NativeWidgetAura(browser_frame),
@@ skipping 40 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeBrowserFrame, public:
 
 // static
 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameAura(browser_frame, browser_view);
 }