Revives the new message center design.

ui/message_center/message_center_bubble.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/message_center_bubble.h"
 
+#include "base/command_line.h"
 #include "grit/ui_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/size.h"
+#include "ui/message_center/message_center_switches.h"
 #include "ui/message_center/message_view.h"
 #include "ui/message_center/message_view_factory.h"
+#include "ui/views/background.h"
+#include "ui/views/border.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/painter.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace message_center {
 
 namespace {
 
 const int kMessageBubbleBaseMinHeight = 80;
 const int kMessageBubbleBaseMaxHeight = 400;
+const int kMarginBetweenItems = 10;
+const int kItemShadowHeight = 4;
+const SkColor kMessageCenterBackgroundColor = SkColorSetRGB(0xe5, 0xe5, 0xe5);
 const SkColor kBorderDarkColor = SkColorSetRGB(0xaa, 0xaa, 0xaa);
+const SkColor kMessageItemShadowColorBase = SkColorSetARGB(0.3 * 255, 0, 0, 0);
+const SkColor kTransparentColor = SkColorSetARGB(0, 0, 0, 0);
+
+bool UseNewDesign() {
+  return CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kEnableNewMessageCenterBubble);
+}
 
 // The view for the buttons at the bottom of the web notification tray.
 class WebNotificationButtonView : public views::View,
                                   public views::ButtonListener {
  public:
   explicit WebNotificationButtonView(NotificationList::Delegate* list_delegate)
       : list_delegate_(list_delegate),
         close_all_button_(NULL) {
     set_background(views::Background::CreateBackgroundPainter(
         true,
@@ skipping 43 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationButtonView);
 };
 
 // A custom scroll-view that has a specified size.
 class FixedSizedScrollView : public views::ScrollView {
  public:
   FixedSizedScrollView() {
     set_focusable(true);
     set_notify_enter_exit_on_child(true);
+    if (UseNewDesign()) {
+      set_background(views::Background::CreateSolidBackground(
+          kMessageCenterBackgroundColor));
+    }
   }
 
   virtual ~FixedSizedScrollView() {}
 
   void SetFixedSize(const gfx::Size& size) {
     if (fixed_size_ == size)
       return;
     fixed_size_ = size;
     PreferredSizeChanged();
   }
@@ skipping 29 matching lines @@
  private:
   gfx::Size fixed_size_;
 
   DISALLOW_COPY_AND_ASSIGN(FixedSizedScrollView);
 };
 
 // Container for the messages.
 class ScrollContentView : public views::View {
  public:
   ScrollContentView() {
-    views::BoxLayout* layout =
-        new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1);
-    layout->set_spread_blank_space(true);
-    SetLayoutManager(layout);
+    if (UseNewDesign()) {
+      // Set the margin to 0 for the layout. BoxLayout assumes the same margin
+      // for top and bottom, but the bottom margin here should be smaller
+      // because of the shadow of message view. Use an empty border instead
+      // to provide this margin.
+      SetLayoutManager(
+          new views::BoxLayout(views::BoxLayout::kVertical,
+                               0,
+                               0,
+                               kMarginBetweenItems - kItemShadowHeight));
+      set_background(views::Background::CreateSolidBackground(
+          kMessageCenterBackgroundColor));
+      set_border(views::Border::CreateEmptyBorder(
+          kMarginBetweenItems, /* top */
+          kMarginBetweenItems, /* left */
+          kMarginBetweenItems - kItemShadowHeight,  /* bottom */
+          kMarginBetweenItems /* right */ ));
+    } else {
+      views::BoxLayout* layout =
+          new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1);
+      layout->set_spread_blank_space(true);
+      SetLayoutManager(layout);
+    }
   }
 
   virtual ~ScrollContentView() {
   }
 
   virtual gfx::Size GetPreferredSize() OVERRIDE {
     if (!preferred_size_.IsEmpty())
       return preferred_size_;
     return views::View::GetPreferredSize();
   }
 
   void set_preferred_size(const gfx::Size& size) { preferred_size_ = size; }
 
  private:
   gfx::Size preferred_size_;
   DISALLOW_COPY_AND_ASSIGN(ScrollContentView);
 };
 
+// A view to draw gradient shadow for each MessageView.
+class MessageViewShadow : public views::View {
+ public:
+  MessageViewShadow()
+      : painter_(views::Painter::CreateVerticalGradient(
+            kMessageItemShadowColorBase, kTransparentColor)) {
+  }
+
+ private:
+  // views::View overrides:
+  virtual gfx::Size GetPreferredSize() OVERRIDE {
+    // The preferred size must not be empty. Thus put an arbitrary non-zero
+    // width here. It will be just ignored by the vertical box layout.
+    return gfx::Size(1, kItemShadowHeight);
+  }
+
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
+    painter_->Paint(canvas, bounds().size());
+  }
+
+  scoped_ptr<views::Painter> painter_;
+  DISALLOW_COPY_AND_ASSIGN(MessageViewShadow);
+};
+
 }  // namespace
 
 // Message Center contents.
 class MessageCenterContentsView : public views::View {
  public:
   explicit MessageCenterContentsView(NotificationList::Delegate* list_delegate)
       : list_delegate_(list_delegate) {
+    int between_child = UseNewDesign() ? 0 : 1;
     SetLayoutManager(
-        new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
+        new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, between_child));
 
     scroll_content_ = new ScrollContentView;
     scroller_ = new FixedSizedScrollView;
     scroller_->SetContents(scroll_content_);
     AddChildView(scroller_);
 
     scroller_->SetPaintToLayer(true);
     scroller_->SetFillsBoundsOpaquely(false);
     scroller_->layer()->SetMasksToBounds(true);
 
     button_view_ = new WebNotificationButtonView(list_delegate);
     AddChildView(button_view_);
   }
 
   void FocusContents() {
     scroller_->RequestFocus();
   }
 
   void Update(const NotificationList::Notifications& notifications)  {
     scroll_content_->RemoveAllChildViews(true);
     scroll_content_->set_preferred_size(gfx::Size());
     size_t num_children = 0;
     for (NotificationList::Notifications::const_iterator iter =
              notifications.begin(); iter != notifications.end(); ++iter) {
       MessageView* view =
           MessageViewFactory::ViewForNotification(*iter, list_delegate_);
       view->set_scroller(scroller_);
       view->SetUpView();
-      scroll_content_->AddChildView(view);
+      if (UseNewDesign()) {
+        views::View* container = new views::View();
+        container->SetLayoutManager(
+            new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
+        container->AddChildView(view);
+        container->AddChildView(new MessageViewShadow());
+        scroll_content_->AddChildView(container);
+      } else {
+        scroll_content_->AddChildView(view);
+      }

[dharcourt, 2013/01/07 23:08:16]

Couldn't the view and its shadow be two views one after another in the box
layout view instead of children of a container view? It seems like that would
simpler but there may be disadvantages I'm not thinking of.

[Jun Mukai, 2013/01/08 01:33:22]

The margin between the |view| and shadow has to be 0 but the margin between
shadow and the next view has to be kMarginBetweenItems - kItemShadowHeight.  So
just adding both to scroll_content_ doesn't work well.

And rather than doing some hack to scroll_content_, I think additional
|container| would be simpler.

Thoughts?

[dharcourt, 2013/01/08 01:43:37]

You're right :-). Sorry I missed that.

       if (++num_children >=
           NotificationList::kMaxVisibleMessageCenterNotifications) {
         break;
       }
     }
     if (num_children == 0) {
       views::Label* label = new views::Label(l10n_util::GetStringUTF16(
           IDS_MESSAGE_CENTER_NO_MESSAGES));
       label->SetFont(label->font().DeriveFont(1));
       label->SetEnabledColor(SK_ColorGRAY);
@@ skipping 43 matching lines @@
     : MessageBubbleBase(delegate),
       contents_view_(NULL) {
 }
 
 MessageCenterBubble::~MessageCenterBubble() {}
 
 views::TrayBubbleView::InitParams MessageCenterBubble::GetInitParams(
     views::TrayBubbleView::AnchorAlignment anchor_alignment) {
   views::TrayBubbleView::InitParams init_params =
       GetDefaultInitParams(anchor_alignment);
+  if (UseNewDesign()) {
+    init_params.min_width += kMarginBetweenItems * 2;
+    init_params.max_width += kMarginBetweenItems * 2;

[dharcourt, 2013/01/07 23:08:16]

Message_view.h's kWebNotificationWidth needs to be changed from 320 to 300 to
prevent this from making the message center 340 pixels wide, 20 pixels more than
the design calls for. Note that changing kWebNotificationWidth will change the
current appearance, making current notifications 300 pixels wide instead of 320.
If that's an issue, kWebNotificationWidth shouldn't be changed (except perhaps
for being renamed to kWebNotificationCenterWidth), min_width and max_width
shouldn't be adjusted here, and message_simple_view.cc should be adjusted to
draw itself based on its bounds rather than on kWebNotificationWidth.

[Jun Mukai, 2013/01/08 01:33:22]

very good catch...

I talked with somas, and he said we want to keep the same width of MessageView
regardless of its bubble, which is 300 pixel. So changing kWebNotificationWidth
to 300 would be fine.  thanks!

+  }
+  // TODO(mukai): The new design bubble should have screen-height at most.
   init_params.max_height = kMessageBubbleBaseMaxHeight;
   init_params.can_activate = true;
   return init_params;
 }
 
 void MessageCenterBubble::InitializeContents(
     views::TrayBubbleView* new_bubble_view) {
   set_bubble_view(new_bubble_view);
   contents_view_ = new MessageCenterContentsView(list_delegate());
   bubble_view()->AddChildView(contents_view_);
@@ skipping 19 matching lines @@
 }
 
 void MessageCenterBubble::OnMouseExitedView() {
 }
 
 size_t MessageCenterBubble::NumMessageViewsForTest() const {
   return contents_view_->NumMessageViews();
 }
 
 }  // namespace message_center