Pass const gfx::Rect& as the first parameter to FillRect.

chrome/browser/ui/views/wrench_menu.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/wrench_menu.h"
 
 #include <algorithm>
 #include <cmath>
 #include <set>
 
@@ skipping 128 matching lines @@
   }
 
   virtual void Paint(gfx::Canvas* canvas, View* view) const {
     CustomButton::ButtonState state =
         (view->GetClassName() == views::Label::kViewClassName) ?
         CustomButton::BS_NORMAL : static_cast<CustomButton*>(view)->state();
     int w = view->width();
     int h = view->height();
     switch (TypeAdjustedForRTL()) {
       case LEFT_BUTTON:
-        canvas->FillRect(background_color(state), gfx::Rect(1, 1, w, h - 2));
-        canvas->FillRect(border_color(state), gfx::Rect(2, 0, w, 1));
-        canvas->FillRect(border_color(state), gfx::Rect(1, 1, 1, 1));
-        canvas->FillRect(border_color(state), gfx::Rect(0, 2, 1, h - 4));
-        canvas->FillRect(border_color(state), gfx::Rect(1, h - 2, 1, 1));
-        canvas->FillRect(border_color(state), gfx::Rect(2, h - 1, w, 1));
+        canvas->FillRect(gfx::Rect(1, 1, w, h - 2), background_color(state));
+        canvas->FillRect(gfx::Rect(2, 0, w, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(1, 1, 1, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(0, 2, 1, h - 4), border_color(state));
+        canvas->FillRect(gfx::Rect(1, h - 2, 1, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(2, h - 1, w, 1), border_color(state));
         break;
 
       case CENTER_BUTTON: {
-        canvas->FillRect(background_color(state),
-                         gfx::Rect(1, 1, w - 2, h - 2));
+        canvas->FillRect(gfx::Rect(1, 1, w - 2, h - 2),
+                         background_color(state));
         SkColor left_color = state != CustomButton::BS_NORMAL ?
             border_color(state) : border_color(left_button_->state());
-        canvas->FillRect(left_color, gfx::Rect(0, 0, 1, h));
-        canvas->FillRect(border_color(state), gfx::Rect(1, 0, w - 2, 1));
-        canvas->FillRect(border_color(state), gfx::Rect(1, h - 1, w - 2, 1));
+        canvas->FillRect(gfx::Rect(0, 0, 1, h), left_color);
+        canvas->FillRect(gfx::Rect(1, 0, w - 2, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(1, h - 1, w - 2, 1), border_color(state));
         SkColor right_color = state != CustomButton::BS_NORMAL ?
             border_color(state) : border_color(right_button_->state());
-        canvas->FillRect(right_color, gfx::Rect(w - 1, 0, 1, h));
+        canvas->FillRect(gfx::Rect(w - 1, 0, 1, h), right_color);
         break;
       }
 
       case RIGHT_BUTTON:
-        canvas->FillRect(background_color(state),
-                         gfx::Rect(0, 1, w - 1, h - 2));
-        canvas->FillRect(border_color(state), gfx::Rect(0, 0, w - 2, 1));
-        canvas->FillRect(border_color(state), gfx::Rect(w - 2, 1, 1, 1));
-        canvas->FillRect(border_color(state), gfx::Rect(w - 1, 2, 1, h - 4));
-        canvas->FillRect(border_color(state), gfx::Rect(w - 2, h - 2, 1, 1));
-        canvas->FillRect(border_color(state), gfx::Rect(0, h - 1, w - 2, 1));
+        canvas->FillRect(gfx::Rect(0, 1, w - 1, h - 2),
+                         background_color(state));
+        canvas->FillRect(gfx::Rect(0, 0, w - 2, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(w - 2, 1, 1, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(w - 1, 2, 1, h - 4), border_color(state));
+        canvas->FillRect(gfx::Rect(w - 2, h - 2, 1, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(0, h - 1, w - 2, 1), border_color(state));
         break;
 
       case SINGLE_BUTTON:
-        canvas->FillRect(background_color(state),
-                         gfx::Rect(1, 1, w - 2, h - 2));
-        canvas->FillRect(border_color(state), gfx::Rect(2, 0, w - 4, 1));
-        canvas->FillRect(border_color(state), gfx::Rect(1, 1, 1, 1));
-        canvas->FillRect(border_color(state), gfx::Rect(0, 2, 1, h - 4));
-        canvas->FillRect(border_color(state), gfx::Rect(1, h - 2, 1, 1));
-        canvas->FillRect(border_color(state), gfx::Rect(2, h - 1, w - 4, 1));
-        canvas->FillRect(border_color(state), gfx::Rect(w - 2, 1, 1, 1));
-        canvas->FillRect(border_color(state), gfx::Rect(w - 1, 2, 1, h - 4));
-        canvas->FillRect(border_color(state), gfx::Rect(w - 2, h - 2, 1, 1));
+        canvas->FillRect(gfx::Rect(1, 1, w - 2, h - 2),
+                         background_color(state));
+        canvas->FillRect(gfx::Rect(2, 0, w - 4, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(1, 1, 1, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(0, 2, 1, h - 4), border_color(state));
+        canvas->FillRect(gfx::Rect(1, h - 2, 1, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(2, h - 1, w - 4, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(w - 2, 1, 1, 1), border_color(state));
+        canvas->FillRect(gfx::Rect(w - 1, 2, 1, h - 4), border_color(state));
+        canvas->FillRect(gfx::Rect(w - 2, h - 2, 1, 1), border_color(state));
         break;
 
       default:
         NOTREACHED();
         break;
     }
   }
 
  private:
   static SkColor border_color(CustomButton::ButtonState state) {
@@ skipping 692 matching lines @@
   bookmark_menu_delegate_.reset(
       new BookmarkMenuDelegate(browser_->profile(),
                                NULL,
                                parent,
                                first_bookmark_command_id_));
   bookmark_menu_delegate_->Init(
       this, bookmark_menu_, model->bookmark_bar_node(), 0,
       BookmarkMenuDelegate::SHOW_PERMANENT_FOLDERS,
       bookmark_utils::LAUNCH_WRENCH_MENU);
 }