ash/wm: Use gfx::Canvas::FillRect to draw the separator line instead of relying in DrawLine.

ash/wm/panel_frame_view.cc

 // Copyright (c) 2012 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 "ash/wm/panel_frame_view.h"
 
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "ui/aura/cursor.h"
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace ash {
 
 namespace {
 const int kClientViewPaddingLeft = 0;
 const int kClientViewPaddingRight = 0;
 const int kClientViewPaddingBottom = 0;
+const int kSeparatorWidth = 1;
 const SkColor kCaptionColor = SK_ColorGRAY;
 const SkColor kCaptionIconDivisorColor = SkColorSetARGB(0xFF, 0x55, 0x55, 0x55);
 }
 
 // Buttons for panel control
 class PanelControlButton : public views::CustomButton {
  public:
   PanelControlButton(views::ButtonListener* listener,
                      const SkBitmap& icon)
       : views::CustomButton(listener),
@@ skipping 48 matching lines @@
   // Overridden from views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     return gfx::Size(0, close_button_->GetPreferredSize().height());
   }
 
 
  private:
   // Overridden from views::View:
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
     canvas->FillRect(GetLocalBounds(), kCaptionColor);
-    gfx::Rect close_button_bounds = close_button_->bounds();
-    canvas->DrawLine(
-        gfx::Point(close_button_bounds.x(), close_button_bounds.y()),
-        gfx::Point(close_button_bounds.x(), close_button_bounds.bottom()),
-        kCaptionIconDivisorColor);
+    gfx::Rect bounds(close_button_->bounds());
+    canvas->FillRect(gfx::Rect(bounds.x(), bounds.y(), kSeparatorWidth,
+                               bounds.bottom()), kCaptionIconDivisorColor);

[Peter Kasting, 2012/03/14 20:23:09]

Shouldn't this be bounds.height()?  Actually a cleaner way of doing all this
would be:

    gfx::Rect separator(close_button_->bounds());
    separator.set_width(kSeparatorWidth);
    canvas->FillRect(separator, kCaptionIconSeparatorColor);

(Note the renaming of the color constant for consistency)

[tfarina, 2012/03/14 20:36:37]

Done.

   }
 
   virtual void Layout() OVERRIDE {
     gfx::Size close_ps = close_button_->GetPreferredSize();
     close_button_->SetBoundsRect(
         gfx::Rect(width() - close_ps.width(), 0,
                   close_ps.width(), close_ps.height()));
   }
 
   // Overriden from views::ButtonListener:
@@ skipping 68 matching lines @@
     const gfx::Rect& client_bounds) const {
   gfx::Rect window_bounds = client_bounds;
   window_bounds.Inset(-kClientViewPaddingLeft,
                       -CaptionHeight(),
                       -kClientViewPaddingRight,
                       -kClientViewPaddingBottom);
   return window_bounds;
 }
 
 }