Revert 111288 - Possibly broke media_unittests on Mac

chrome/browser/ui/views/frame/app_panel_browser_frame_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/frame/app_panel_browser_frame_view.h"
 
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
@@ skipping 432 matching lines @@
   canvas->TileImageInt(*bottom, client_area_bounds.x(), client_area_bottom,
                        client_area_bounds.width(), bottom_right->height());
   canvas->DrawBitmapInt(*bottom_left,
       client_area_bounds.x() - bottom_left->width(), client_area_bottom);
 
   // Left.
   canvas->TileImageInt(*left, client_area_bounds.x() - left->width(),
       client_area_top, left->width(), client_area_height);
 
   // Draw the toolbar color to fill in the edges.
-  canvas->DrawRect(gfx::Rect(client_area_bounds.x() - kClientEdgeThickness,
-     client_area_top - kClientEdgeThickness,
-     client_area_bounds.width() + kClientEdgeThickness,
-     client_area_bottom - client_area_top + kClientEdgeThickness),
-     ui::ResourceBundle::toolbar_color);
+  canvas->DrawRectInt(ResourceBundle::toolbar_color,
+      client_area_bounds.x() - kClientEdgeThickness,
+      client_area_top - kClientEdgeThickness,
+      client_area_bounds.width() + kClientEdgeThickness,
+      client_area_bottom - client_area_top + kClientEdgeThickness);
 }
 
 void AppPanelBrowserFrameView::LayoutWindowControls() {
   close_button_->SetImageAlignment(views::ImageButton::ALIGN_LEFT,
                                    views::ImageButton::ALIGN_BOTTOM);
   bool is_maximized = frame()->IsMaximized();
   // There should always be the same number of non-border pixels visible to the
   // side of the close button.  In maximized mode we extend the button to the
   // screen corner to obey Fitts' Law.
   int right_extra_width = is_maximized ? kCloseButtonFrameBorderSpacing : 0;
@@ skipping 28 matching lines @@
 }
 
 gfx::Rect AppPanelBrowserFrameView::CalculateClientAreaBounds(int width,
     int height) const {
   int top_height = NonClientTopBorderHeight();
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(border_thickness, top_height,
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - top_height - border_thickness));
 }