Fix Ash status area bubble borders

ash/system/web_notification/web_notification_tray.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 "ash/system/web_notification/web_notification_tray.h"
 
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/tray_bubble_view.h"
 #include "ash/system/tray/tray_constants.h"
@@ skipping 464 matching lines @@
 
  private:
   WebNotificationTray* tray_;
   TrayPopupTextButton* close_all_button_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationButtonView);
 };
 
 class WebContentsView : public views::View {
  public:
-  WebContentsView() {}
+  explicit WebContentsView(WebNotificationTray* tray)
+      : tray_(tray) {
+    // TODO(stevenjb): Remove this border when TrayBubbleBorder is integrated
+    // with BubbleBorder.
+    int left = (tray->shelf_alignment() == SHELF_ALIGNMENT_LEFT) ? 0 : 1;
+    int right = (tray->shelf_alignment() == SHELF_ALIGNMENT_RIGHT) ? 0 : 1;
+    int bottom = (tray->shelf_alignment() == SHELF_ALIGNMENT_BOTTOM) ? 0 : 1;
+    set_border(views::Border::CreateSolidSidedBorder(
+        1, left, bottom, right, ash::kBorderDarkColor));
+    set_notify_enter_exit_on_child(true);
+  }
   virtual ~WebContentsView() {}
 
   virtual void Update(
       const WebNotificationList::Notifications& notifications) = 0;
 
+ protected:
+  WebNotificationTray* tray_;
+
  private:
   DISALLOW_COPY_AND_ASSIGN(WebContentsView);
 };
 
 class MessageCenterContentsView : public WebContentsView {
  public:
   explicit MessageCenterContentsView(WebNotificationTray* tray)
-      : tray_(tray) {
-    set_border(views::Border::CreateSolidSidedBorder(
-        1, 1, 1, 1, ash::kBorderDarkColor));
-
+      : WebContentsView(tray) {
     SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
     set_background(views::Background::CreateSolidBackground(kBackgroundColor));
 
     scroll_content_ = new views::View;
     scroll_content_->SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
 
     scroller_ = new internal::FixedSizedScrollView;
     scroller_->SetContentsView(scroll_content_);
@@ skipping 23 matching lines @@
     int button_height = button_view_->GetPreferredSize().height();
     int scroll_height = std::min(
         std::max(scroll_size.height(),
                  kWebNotificationBubbleMinHeight - button_height),
         kWebNotificationBubbleMaxHeight - button_height);
     scroll_size.set_height(scroll_height);
     scroller_->SetFixedSize(scroll_size);
     scroller_->SizeToPreferredSize();
   }
 
-  WebNotificationTray* tray_;
   internal::FixedSizedScrollView* scroller_;
   views::View* scroll_content_;
   internal::WebNotificationButtonView* button_view_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageCenterContentsView);
 };
 
 class WebNotificationContentsView : public WebContentsView {
  public:
   explicit WebNotificationContentsView(WebNotificationTray* tray)
-      : tray_(tray) {
-    set_border(views::Border::CreateSolidSidedBorder(
-        1, 1, 1, 1, ash::kBorderDarkColor));
-
+      : WebContentsView(tray) {
     SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
     set_background(views::Background::CreateSolidBackground(kBackgroundColor));
 
     content_ = new views::View;
     content_->SetLayoutManager(
         new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 1));
     AddChildView(content_);
   }
 
   void Update(const WebNotificationList::Notifications& notifications) {
     content_->RemoveAllChildViews(true);
     WebNotificationList::Notifications::const_iterator iter =
         notifications.begin();
     WebNotificationView* view = new WebNotificationView(tray_, *iter);
     content_->AddChildView(view);
     GetWidget()->GetRootView()->SchedulePaint();
   }
 
  private:
-  WebNotificationTray* tray_;
   views::View* content_;
 
   DISALLOW_COPY_AND_ASSIGN(WebNotificationContentsView);
 };
 
 }  // namespace internal
 
 using internal::TrayBubbleView;
 using internal::WebNotificationList;
 using internal::WebContentsView;
@@ skipping 340 matching lines @@
 
 void WebNotificationTray::HideBubble(Bubble* bubble) {
   if (bubble == message_center_bubble()) {
     HideMessageCenterBubble();
   } else if (bubble == notification_bubble()) {
     notification_bubble_.reset();
   }
 }
 
 }  // namespace ash