makes NotificationView aware of border.

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 "third_party/skia/include/core/SkPaint.h"
 #include "ui/base/l10n/l10n_util.h"
@@ skipping 351 matching lines @@
     bounds.Inset(gfx::Insets(kItemShadowBlur / 2, kItemShadowBlur / 2,
                              kItemShadowBlur / 2, kItemShadowBlur / 2));
     canvas->DrawRect(bounds, paint);
   }
 
   virtual gfx::Insets GetInsets() const OVERRIDE {
     return GetItemShadowInsets();
   }
 };
 
-// A layout manager which is similar to views::FillLayout but respects the
-// border.
-class FillWithBorderLayout : public views::LayoutManager {
- public:
-  FillWithBorderLayout() {}
-  virtual ~FillWithBorderLayout() {}
-
-  // views::LayoutManager overrides:
-  virtual void Layout(views::View* host) OVERRIDE {
-    if (!host->has_children())
-      return;
-    host->child_at(0)->SetBoundsRect(host->GetContentsBounds());
-  }
-
-  virtual gfx::Size GetPreferredSize(views::View* host) OVERRIDE {
-    DCHECK_EQ(1, host->child_count());
-    gfx::Size size = host->child_at(0)->GetPreferredSize();
-    gfx::Insets insets = host->GetInsets();
-    size.Enlarge(insets.width(), insets.height());
-    return size;
-  }
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(FillWithBorderLayout);
-};
-
 }  // namespace
 
 // Message Center contents.
 class MessageCenterContentsView : public views::View {
  public:
   explicit MessageCenterContentsView(MessageCenterBubble* bubble,
                                      NotificationList::Delegate* list_delegate)
       : list_delegate_(list_delegate),
         bubble_(bubble) {
     int between_child = UseNewDesign() ? 0 : 1;
@@ skipping 25 matching lines @@
   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 =
           NotificationView::ViewForNotification(*iter, list_delegate_);
       view->set_scroller(scroller_);
       view->SetUpView();
-      if (UseNewDesign()) {
-        views::View* container = new views::View();
-        container->SetLayoutManager(new FillWithBorderLayout());
-        container->set_border(new MessageViewShadowBorder());
-        container->AddChildView(view);
-        scroll_content_->AddChildView(container);
-      } else {
-        scroll_content_->AddChildView(view);
-      }
+      if (UseNewDesign())
+        view->set_border(new MessageViewShadowBorder());
+      scroll_content_->AddChildView(view);
       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 92 matching lines @@
 }
 
 void MessageCenterBubble::OnMouseExitedView() {
 }
 
 size_t MessageCenterBubble::NumMessageViewsForTest() const {
   return contents_view_->NumMessageViews();
 }
 
 }  // namespace message_center