Chromium Code Reviews| Index: ash/system/tray/tray_background_view.cc |
| diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc |
| index 66c72f26a453b602a6e5b019d409f77edb6cfc7d..6a8566bd892de022c1f5429a308030b7d5fe1f1d 100644 |
| --- a/ash/system/tray/tray_background_view.cc |
| +++ b/ash/system/tray/tray_background_view.cc |
| @@ -39,7 +39,7 @@ class TrayBackground : public views::Background { |
| paint.setStyle(SkPaint::kFill_Style); |
| paint.setColor(SkColorSetARGB(alpha_, 0, 0, 0)); |
| SkPath path; |
| - gfx::Rect bounds(view->bounds()); |
| + gfx::Rect bounds(view->GetLocalBounds()); |
| SkScalar radius = SkIntToScalar(kTrayRoundedBorderRadius); |
| path.addRoundRect(gfx::RectToSkRect(bounds), radius, radius); |
| canvas->DrawPath(path, paint); |
| @@ -60,9 +60,6 @@ TrayBackgroundView::TrayBackgroundView() |
| this, 0, kTrayBackgroundAlpha)), |
| ALLOW_THIS_IN_INITIALIZER_LIST(hover_background_animator_( |
| this, 0, kTrayBackgroundHoverAlpha - kTrayBackgroundAlpha)) { |
| - set_border(views::Border::CreateEmptyBorder(0, 0, |
| - kPaddingFromBottomOfScreenBottomAlignment, |
| - kPaddingFromRightEdgeOfScreenBottomAlignment)); |
|
sadrul
2012/07/03 13:07:47
Is this removal intentional?
jennyz
2012/07/10 17:26:56
Yes, this is done in SystemTray::SetBorder() based
|
| set_notify_enter_exit_on_child(true); |
| // Initially we want to paint the background, but without the hover effect. |