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

views/touchui/touch_selection_controller_impl.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 "views/touchui/touch_selection_controller_impl.h"
 
+#include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "base/time.h"
 #include "grit/ui_strings.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/transform.h"
 #include "views/background.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/custom_button.h"
 #include "views/controls/button/text_button.h"
+#include "views/controls/label.h"
 #include "views/controls/menu/menu_config.h"
-#include "views/controls/label.h"
 #include "views/layout/box_layout.h"
 #include "views/widget/widget.h"
 
 namespace {
 
 // Constants defining the visual attributes of selection handles
 const int kSelectionHandleRadius = 10;
 const int kSelectionHandleCursorHeight = 10;
 const int kSelectionHandleAlpha = 0x7F;
 const SkColor kSelectionHandleColor =
@@ skipping 148 matching lines @@
     SkColor background_color, border_color;
     if (state == CustomButton::BS_NORMAL) {
       background_color = SkColorSetARGB(102, 255, 255, 255);
       border_color = SkColorSetARGB(36, 0, 0, 0);
     } else {
       background_color = SkColorSetARGB(13, 0, 0, 0);
       border_color = SkColorSetARGB(72, 0, 0, 0);
     }
     int w = view->width();
     int h = view->height();
-    canvas->FillRectInt(background_color, 1, 1, w - 2, h - 2);
-    canvas->FillRectInt(border_color, 2, 0, w - 4, 1);
-    canvas->FillRectInt(border_color, 1, 1, 1, 1);
-    canvas->FillRectInt(border_color, 0, 2, 1, h - 4);
-    canvas->FillRectInt(border_color, 1, h - 2, 1, 1);
-    canvas->FillRectInt(border_color, 2, h - 1, w - 4, 1);
-    canvas->FillRectInt(border_color, w - 2, 1, 1, 1);
-    canvas->FillRectInt(border_color, w - 1, 2, 1, h - 4);
-    canvas->FillRectInt(border_color, w - 2, h - 2, 1, 1);
+    canvas->FillRect(background_color, gfx::Rect(1, 1, w - 2, h - 2));
+    canvas->FillRect(border_color, gfx::Rect(2, 0, w - 4, 1));
+    canvas->FillRect(border_color, gfx::Rect(1, 1, 1, 1));
+    canvas->FillRect(border_color, gfx::Rect(0, 2, 1, h - 4));
+    canvas->FillRect(border_color, gfx::Rect(1, h - 2, 1, 1));
+    canvas->FillRect(border_color, gfx::Rect(2, h - 1, w - 4, 1));
+    canvas->FillRect(border_color, gfx::Rect(w - 2, 1, 1, 1));
+    canvas->FillRect(border_color, gfx::Rect(w - 1, 2, 1, h - 4));
+    canvas->FillRect(border_color, gfx::Rect(w - 2, h - 2, 1, 1));
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ContextMenuButtonBackground);
 };
 
 // A View that displays the touch context menu.
 class TouchSelectionControllerImpl::TouchContextMenuView
     : public ButtonListener,
       public View {
@@ skipping 286 matching lines @@
 bool TouchSelectionControllerImpl::IsSelectionHandle2Visible() {
   return selection_handle_2_->IsVisible();
 }
 
 TouchSelectionController* TouchSelectionController::create(
     TouchSelectionClientView* client_view) {
   return new TouchSelectionControllerImpl(client_view);
 }
 
 }  // namespace views