Message center re-organized

ui/message_center/views/message_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 "ui/message_center/views/message_view.h"
 
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #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"
 #include "ui/message_center/message_center_util.h"
 #include "ui/views/context_menu_controller.h"
 #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 {
 
 const int kCloseIconTopPadding = 5;
 const int kCloseIconRightPadding = 5;
 const int kExpandIconBottomPadding = 8;
 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;
 const int kShowSettingsCommand = 2;
 
 // ControlButtons are ImageButtons whose image can be padded within the button.
 // This allows the creation of buttons like the notification close and expand
 // buttons whose clickable areas extends beyond their image areas
 // (<http://crbug.com/168822>) without the need to create and maintain
 // corresponding resource images with alpha padding. In the future, this class
@@ skipping 109 matching lines @@
     offset.set_x(bounds.width() - image.width());  // Right align.
 
   if (padding_.top() == 0 && padding_.bottom() == 0)
     offset.set_y((bounds.height() - image.height()) / 2);  // Middle align.
   else if (padding_.bottom() > 0)
     offset.set_y(bounds.height() - image.height());  // Bottom align.
 
   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 {
  public:
   MenuModel(message_center::MessageCenter* message_center,
             message_center::MessageCenterTray* tray,
             const std::string& notification_id,
             const string16& display_source,
             const std::string& extension_id);
   virtual ~MenuModel();
@@ skipping 182 matching lines @@
 
 // static
 gfx::Insets MessageView::GetShadowInsets() {
   return gfx::Insets(kShadowBlur / 2 - kShadowOffset,
                      kShadowBlur / 2,
                      kShadowBlur / 2 + kShadowOffset,
                      kShadowBlur / 2);
 }
 
 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() {
   views::FocusManager* focus_manager = GetFocusManager();
   return focus_manager && focus_manager->GetFocusedView() == close_button();
 }
 
 void MessageView::RequestFocusOnCloseButton() {
   close_button_->RequestFocus();
 }
@@ skipping 72 matching lines @@
     is_expanded_ = true;
     message_center_->ExpandNotification(notification_id_);
   }
 }
 
 void MessageView::OnSlideOut() {
   message_center_->RemoveNotification(notification_id_, true);  // By user.
 }
 
 }  // namespace message_center