Use the correct launcher assets for shelf alignment.

ash/launcher/overflow_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/launcher/overflow_bubble.h"
 
 #include <algorithm>
 
 #include "ash/launcher/launcher_types.h"
 #include "ash/launcher/launcher_view.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/shell.h"
+#include "ash/wm/shelf_layout_manager.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/bubble/bubble_delegate.h"
 #include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace internal {
 
 namespace {
 
 // Max bubble size to screen size ratio.
 const float kMaxBubbleSizeToScreenRatio = 0.5f;
 
 // Inner padding in pixels for launcher view inside bubble.
 const int kPadding = 2;
 
 // Padding space in pixels between LauncherView's left/top edge to its contents.
 const int kLauncherViewLeadingInset = 8;
 
-// Gets arrow location based on shelf alignment.
-views::BubbleBorder::ArrowLocation GetBubbleArrowLocation(
-    ShelfAlignment shelf_alignment) {
-  switch (shelf_alignment) {
-    case ash::SHELF_ALIGNMENT_BOTTOM:
-      return views::BubbleBorder::BOTTOM_LEFT;
-    case ash::SHELF_ALIGNMENT_LEFT:
-      return views::BubbleBorder::LEFT_TOP;
-    case ash::SHELF_ALIGNMENT_RIGHT:
-      return views::BubbleBorder::RIGHT_TOP;
-    default:
-      NOTREACHED() << "Unknown shelf alignment " << shelf_alignment;
-      return views::BubbleBorder::BOTTOM_LEFT;
-  }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 // OverflowBubbleView
 // OverflowBubbleView hosts a LauncherView to display overflown items.
 
 class OverflowBubbleView : public views::BubbleDelegateView {
  public:
   OverflowBubbleView();
   virtual ~OverflowBubbleView();
 
   void InitOverflowBubble(LauncherDelegate* delegate,
                           LauncherModel* model,
                           views::View* anchor,
-                          ShelfAlignment shelf_alignment,
                           int overflow_start_index);
 
  private:
-  bool is_horizontal_alignment() const {
-    return shelf_alignment_ == SHELF_ALIGNMENT_BOTTOM;
+  bool IsHorizontalAlignment() const {
+    return GetShelfLayoutManagerForLauncher()->IsHorizontalAlignment();
   }
 
   const gfx::Size GetContentsSize() const {
     return static_cast<views::View*>(launcher_view_)->GetPreferredSize();
   }
 
+  // Gets arrow location based on shelf alignment.
+  views::BubbleBorder::ArrowLocation GetBubbleArrowLocation() const {
+    return GetShelfLayoutManagerForLauncher()->SelectValueForShelfAlignment(
+        views::BubbleBorder::BOTTOM_LEFT,
+        views::BubbleBorder::LEFT_TOP,
+        views::BubbleBorder::RIGHT_TOP);
+  }
+
   void ScrollByXOffset(int x_offset);
   void ScrollByYOffset(int y_offset);
 
   // views::View overrides:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
   virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
   virtual bool OnMouseWheel(const ui::MouseWheelEvent& event) OVERRIDE;
 
   // ui::EventHandler overrides:
   virtual ui::EventResult OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
 
   // views::BubbleDelegate overrides:
   virtual gfx::Rect GetBubbleBounds() OVERRIDE;
 
-  ShelfAlignment shelf_alignment_;
+  ShelfLayoutManager* GetShelfLayoutManagerForLauncher() const {
+    return ShelfLayoutManager::ForLauncher(
+        anchor_view()->GetWidget()->GetNativeView());
+  }
+
   LauncherView* launcher_view_;  // Owned by views hierarchy.
   gfx::Vector2d scroll_offset_;
 
   DISALLOW_COPY_AND_ASSIGN(OverflowBubbleView);
 };
 
 OverflowBubbleView::OverflowBubbleView()
-    : shelf_alignment_(SHELF_ALIGNMENT_BOTTOM),
-      launcher_view_(NULL) {
+    : launcher_view_(NULL) {
 }
 
 OverflowBubbleView::~OverflowBubbleView() {
 }
 
 void OverflowBubbleView::InitOverflowBubble(LauncherDelegate* delegate,
                                             LauncherModel* model,
                                             views::View* anchor,
-                                            ShelfAlignment shelf_alignment,
                                             int overflow_start_index) {
-  shelf_alignment_ = shelf_alignment;
-
   // Makes bubble view has a layer and clip its children layers.
   SetPaintToLayer(true);
   SetFillsBoundsOpaquely(false);
   layer()->SetMasksToBounds(true);
+  ShelfAlignment shelf_alignment = GetShelfLayoutManagerForLauncher()->
+      GetAlignment();
 
   launcher_view_ = new LauncherView(model, delegate, NULL);
   launcher_view_->set_first_visible_index(overflow_start_index);
   launcher_view_->set_leading_inset(kLauncherViewLeadingInset);
   launcher_view_->Init();
   launcher_view_->SetAlignment(shelf_alignment);
   AddChildView(launcher_view_);
 
   set_anchor_view(anchor);
-  set_arrow_location(GetBubbleArrowLocation(shelf_alignment));
+  set_arrow_location(GetBubbleArrowLocation());
   set_background(NULL);
   set_color(SkColorSetARGB(kLauncherBackgroundAlpha, 0, 0, 0));
   set_margins(gfx::Insets(kPadding, kPadding, kPadding, kPadding));
   set_move_with_anchor(true);
   views::BubbleDelegateView::CreateBubble(this);
 }
 
 void OverflowBubbleView::ScrollByXOffset(int x_offset) {
   const gfx::Rect visible_bounds(GetContentsBounds());
   const gfx::Size contents_size(GetContentsSize());
@@ skipping 11 matching lines @@
                    std::max(0, scroll_offset_.y() + y_offset));
   scroll_offset_.set_y(y);
 }
 
 gfx::Size OverflowBubbleView::GetPreferredSize() {
   gfx::Size preferred_size = GetContentsSize();
 
   const gfx::Rect monitor_rect = Shell::GetScreen()->GetDisplayNearestPoint(
       GetAnchorRect().CenterPoint()).work_area();
   if (!monitor_rect.IsEmpty()) {
-    if (is_horizontal_alignment()) {
+    if (IsHorizontalAlignment()) {
       preferred_size.set_width(std::min(
           preferred_size.width(),
           static_cast<int>(monitor_rect.width() *
                            kMaxBubbleSizeToScreenRatio)));
     } else {
       preferred_size.set_height(std::min(
           preferred_size.height(),
           static_cast<int>(monitor_rect.height() *
                            kMaxBubbleSizeToScreenRatio)));
     }
@@ skipping 10 matching lines @@
 void OverflowBubbleView::ChildPreferredSizeChanged(views::View* child) {
   // Ensures |launch_view_| is still visible.
   ScrollByXOffset(0);
   ScrollByYOffset(0);
   Layout();
 
   SizeToContents();
 }
 
 bool OverflowBubbleView::OnMouseWheel(const ui::MouseWheelEvent& event) {
-  if (is_horizontal_alignment())
+  if (IsHorizontalAlignment())
     ScrollByXOffset(-event.offset());
   else
     ScrollByYOffset(-event.offset());
   Layout();
 
   return true;
 }
 
 ui::EventResult OverflowBubbleView::OnScrollEvent(ui::ScrollEvent* event) {
   ScrollByXOffset(-event->x_offset());
@@ skipping 53 matching lines @@
     : bubble_(NULL) {
 }
 
 OverflowBubble::~OverflowBubble() {
   Hide();
 }
 
 void OverflowBubble::Show(LauncherDelegate* delegate,
                           LauncherModel* model,
                           views::View* anchor,
-                          ShelfAlignment shelf_alignment,
                           int overflow_start_index) {
   Hide();
 
   OverflowBubbleView* bubble_view = new OverflowBubbleView();
   bubble_view->InitOverflowBubble(delegate,
                                   model,
                                   anchor,
-                                  shelf_alignment,
                                   overflow_start_index);
 
   bubble_ = bubble_view;
   ash::Shell::GetInstance()->system_tray()->InitializeBubbleAnimations(
       bubble_->GetWidget());
   bubble_->GetWidget()->AddObserver(this);
   bubble_->GetWidget()->Show();
 }
 
 void OverflowBubble::Hide() {
   if (!IsShowing())
     return;
 
   bubble_->GetWidget()->RemoveObserver(this);
   bubble_->GetWidget()->Close();
   bubble_ = NULL;
 }
 
 void OverflowBubble::OnWidgetClosing(views::Widget* widget) {
   DCHECK(widget == bubble_->GetWidget());
   bubble_ = NULL;
 }
 
 }  // namespace internal
 }  // namespace ash