Message center re-organized

ui/message_center/views/message_view.cc

Index: ui/message_center/views/message_view.cc
diff --git a/ui/message_center/views/message_view.cc b/ui/message_center/views/message_view.cc
index cf1bbeaba4aae23854bff6a6195fd0eae153befa..582350713d30954f0699acf92ff6577897864bcb 100644
--- a/ui/message_center/views/message_view.cc
+++ b/ui/message_center/views/message_view.cc
@@ -12,8 +12,6 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/canvas.h"
-#include "ui/gfx/shadow_value.h"
-#include "ui/gfx/skia_util.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_tray.h"
@@ -22,6 +20,7 @@
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/scroll_view.h"
+#include "ui/views/shadow_border.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
@@ -34,8 +33,6 @@ const int kExpandIconRightPadding = 11;
 const int kShadowOffset = 1;
 const int kShadowBlur = 4;
 
-const SkColor kTransparentColor = SkColorSetARGB(0, 0, 0, 0);
-
 // Menu constants
 const int kTogglePermissionCommand = 0;
 const int kToggleExtensionCommand = 1;
@@ -165,40 +162,6 @@ gfx::Point ControlButton::ComputePaddedImagePaintPosition(
   return bounds.origin() + offset;
 }
 
-// A border to provide the shadow for each card.
-// Current shadow should look like css box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3)
-class ShadowBorder : public views::Border {
- public:
-  ShadowBorder() : views::Border() {}
-  virtual ~ShadowBorder() {}
-
- protected:
-  // Overridden from views::Border:
-  virtual void Paint(const views::View& view, gfx::Canvas* canvas) OVERRIDE;
-  virtual gfx::Insets GetInsets() const OVERRIDE;
-
-  DISALLOW_COPY_AND_ASSIGN(ShadowBorder);
-};
-
-void ShadowBorder::Paint(const views::View& view, gfx::Canvas* canvas) {
-  SkPaint paint;
-  std::vector<gfx::ShadowValue> shadows;
-  shadows.push_back(gfx::ShadowValue(gfx::Point(), kShadowBlur,
-      message_center::kShadowColor));
-  skia::RefPtr<SkDrawLooper> looper = gfx::CreateShadowDrawLooper(shadows);
-  paint.setLooper(looper.get());
-  paint.setColor(kTransparentColor);
-  paint.setStrokeJoin(SkPaint::kRound_Join);
-  gfx::Rect bounds(view.size());
-  bounds.Inset(gfx::Insets(kShadowBlur / 2, kShadowBlur / 2,
-                           kShadowBlur / 2, kShadowBlur / 2));
-  canvas->DrawRect(bounds, paint);
-}
-
-gfx::Insets ShadowBorder::GetInsets() const {
-  return message_center::MessageView::GetShadowInsets();
-}
-
 // A dropdown menu for notifications.
 class MenuModel : public ui::SimpleMenuModel,
                   public ui::SimpleMenuModel::Delegate {
@@ -401,7 +364,10 @@ gfx::Insets MessageView::GetShadowInsets() {
 }
 
 void MessageView::CreateShadowBorder() {
-  set_border(new ShadowBorder());
+  set_border(new views::ShadowBorder(kShadowBlur,
+                                     message_center::kShadowColor,
+                                     kShadowOffset,  // Vertical offset.
+                                     0));            // Horizontal offset.
 }
 
 bool MessageView::IsCloseButtonFocused() {