Fix Ash status area bubble borders

ash/system/tray/system_tray_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 "ash/system/tray/system_tray_bubble.h"
 
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/system/tray/system_tray_delegate.h"
 #include "ash/system/tray/system_tray_item.h"
@@ skipping 12 matching lines @@
 
 namespace {
 
 // Normally a detailed view is the same size as the default view. However,
 // when showing a detailed view directly (e.g. clicking on a notification),
 // we may not know the height of the default view, or the default view may
 // be too short, so we use this as a default and minimum height for any
 // detailed view.
 const int kDetailedBubbleMaxHeight = kTrayPopupItemHeight * 5;
 
+// TODO(stevenjb/jennyz): Remove this when TrayBubbleBorder is integrated with
+// BubbleBorder. See crbug.com/132772, crbug.com/139813.
 class TrayPopupItemBorder : public views::Border {
  public:
-  explicit TrayPopupItemBorder(views::View* owner) : owner_(owner) {}
+  explicit TrayPopupItemBorder(views::View* owner, ShelfAlignment alignment)
+      : owner_(owner),
+        alignment_(alignment) {
+  }
   virtual ~TrayPopupItemBorder() {}
 
  private:
   // Overridden from views::Border.
   virtual void Paint(const views::View& view,
                      gfx::Canvas* canvas) const OVERRIDE {
     const views::View* parent = view.parent();
     int index = parent->GetIndexOf(&view);
 
     // Draw a dark top-border for the first item.
     if (index == 0)
       canvas->FillRect(gfx::Rect(0, 0, view.width(), 1), kBorderDarkColor);
 
     // Bottom border.
-    if (index != parent->child_count() - 1) {
+    if ((index != parent->child_count() - 1) ||
+        (alignment_ != SHELF_ALIGNMENT_BOTTOM)) {
       canvas->FillRect(gfx::Rect(0, view.height() - 1, view.width(), 1),
                        kBorderLightColor);
     }
 
     // Left and right borders.
-    canvas->FillRect(gfx::Rect(0, 0, 1, view.height()), kBorderDarkColor);
-    canvas->FillRect(gfx::Rect(view.width() - 1, 0, 1, view.height()),
-        kBorderDarkColor);
+    if (alignment_ != SHELF_ALIGNMENT_LEFT) {
+      canvas->FillRect(gfx::Rect(0, 0, 1, view.height()),
+                       kBorderDarkColor);
+    }
+    if (alignment_ != SHELF_ALIGNMENT_RIGHT) {
+      canvas->FillRect(gfx::Rect(view.width() - 1, 0, 1, view.height()),
+                       kBorderDarkColor);
+    }
   }
 
   virtual void GetInsets(gfx::Insets* insets) const OVERRIDE {
     const views::View* parent = owner_->parent();
     int index = parent->GetIndexOf(owner_);
-    insets->Set(index == 0, 1, index != parent->child_count() - 1, 1);
+    int left = (alignment_ == SHELF_ALIGNMENT_LEFT) ? 0 : 1;
+    int right = (alignment_ == SHELF_ALIGNMENT_RIGHT) ? 0 : 1;
+    insets->Set(index == 0 ? 1 : 0,
+                left,
+                (index != parent->child_count() - 1) ? 1 : 0,
+                right);
   }
 
   views::View* owner_;
+  ShelfAlignment alignment_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayPopupItemBorder);
 };
 
 // A view with some special behaviour for tray items in the popup:
 // - optionally changes background color on hover.
 class TrayPopupItemContainer : public views::View {
  public:
-  TrayPopupItemContainer(views::View* view, bool change_background)
+  TrayPopupItemContainer(views::View* view,
+                         ShelfAlignment alignment,
+                         bool change_background)
       : hover_(false),
         change_background_(change_background) {
     set_notify_enter_exit_on_child(true);
-    set_border(new TrayPopupItemBorder(this));
+    set_border(new TrayPopupItemBorder(this, alignment));
     views::BoxLayout* layout = new views::BoxLayout(
         views::BoxLayout::kVertical, 0, 0, 0);
     layout->set_spread_blank_space(true);
     SetLayoutManager(layout);
     SetPaintToLayer(view->layer() != NULL);
     if (view->layer())
       SetFillsBoundsOpaquely(view->layer()->fills_bounds_opaquely());
     AddChildView(view);
     SetVisible(view->visible());
   }
@@ skipping 287 matching lines @@
         break;
       case BUBBLE_TYPE_DETAILED:
         view = (*it)->CreateDetailedView(login_status);
         break;
       case BUBBLE_TYPE_NOTIFICATION:
         view = (*it)->CreateNotificationView(login_status);
         break;
     }
     if (view) {
       bubble_view_->AddChildView(new TrayPopupItemContainer(
-          view, bubble_type_ == BUBBLE_TYPE_DEFAULT));
+          view, tray_->shelf_alignment(), bubble_type_ == BUBBLE_TYPE_DEFAULT));
     }
   }
 }
 
 void SystemTrayBubble::OnWidgetClosing(views::Widget* widget) {
   CHECK_EQ(bubble_widget_, widget);
   bubble_widget_ = NULL;
   tray_->RemoveBubble(this);
 }
 
 }  // namespace internal
 }  // namespace ash