ash: Minor cleanup, move more files from launcher to shelf.

ash/launcher/overflow_bubble.cc

Index: ash/launcher/overflow_bubble.cc
diff --git a/ash/launcher/overflow_bubble.cc b/ash/launcher/overflow_bubble.cc
deleted file mode 100644
index 7d84d1ef0cbf17ec1805d2ef7b395d78cd1e7ef4..0000000000000000000000000000000000000000
--- a/ash/launcher/overflow_bubble.cc
+++ /dev/null
@@ -1,285 +0,0 @@
-// 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/root_window_controller.h"
-#include "ash/shelf/shelf_layout_manager.h"
-#include "ash/shelf/shelf_widget.h"
-#include "ash/shell.h"
-#include "ash/system/tray/system_tray.h"
-#include "ui/aura/root_window.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;
-
-////////////////////////////////////////////////////////////////////////////////
-// OverflowBubbleView
-// OverflowBubbleView hosts a LauncherView to display overflown items.
-
-class OverflowBubbleView : public views::BubbleDelegateView {
- public:
-  OverflowBubbleView();
-  virtual ~OverflowBubbleView();
-
-  void InitOverflowBubble(views::View* anchor, LauncherView* launcher_view);
-
- private:
-  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::Arrow GetBubbleArrow() const {
-    return GetShelfLayoutManagerForLauncher()->SelectValueForShelfAlignment(
-        views::BubbleBorder::BOTTOM_LEFT,
-        views::BubbleBorder::LEFT_TOP,
-        views::BubbleBorder::RIGHT_TOP,
-        views::BubbleBorder::TOP_LEFT);
-  }
-
-  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 void OnScrollEvent(ui::ScrollEvent* event) OVERRIDE;
-
-  // views::BubbleDelegate overrides:
-  virtual gfx::Rect GetBubbleBounds() OVERRIDE;
-
-  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()
-    : launcher_view_(NULL) {
-}
-
-OverflowBubbleView::~OverflowBubbleView() {
-}
-
-void OverflowBubbleView::InitOverflowBubble(views::View* anchor,
-                                            LauncherView* launcher_view) {
-  // set_anchor_view needs to be called before GetShelfLayoutManagerForLauncher
-  // can be called.
-  set_anchor_view(anchor);
-  set_arrow(GetBubbleArrow());
-  set_background(NULL);
-  set_color(SkColorSetARGB(kLauncherBackgroundAlpha, 0, 0, 0));
-  set_margins(gfx::Insets(kPadding, kPadding, kPadding, kPadding));
-  set_move_with_anchor(true);
-
-  // Makes bubble view has a layer and clip its children layers.
-  SetPaintToLayer(true);
-  SetFillsBoundsOpaquely(false);
-  layer()->SetMasksToBounds(true);
-
-  launcher_view_ = launcher_view;
-  AddChildView(launcher_view_);
-
-  views::BubbleDelegateView::CreateBubble(this);
-}
-
-void OverflowBubbleView::ScrollByXOffset(int x_offset) {
-  const gfx::Rect visible_bounds(GetContentsBounds());
-  const gfx::Size contents_size(GetContentsSize());
-
-  int x = std::min(contents_size.width() - visible_bounds.width(),
-                   std::max(0, scroll_offset_.x() + x_offset));
-  scroll_offset_.set_x(x);
-}
-
-void OverflowBubbleView::ScrollByYOffset(int y_offset) {
-  const gfx::Rect visible_bounds(GetContentsBounds());
-  const gfx::Size contents_size(GetContentsSize());
-
-  int y = std::min(contents_size.height() - visible_bounds.height(),
-                   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 (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)));
-    }
-  }
-
-  return preferred_size;
-}
-
-void OverflowBubbleView::Layout() {
-  launcher_view_->SetBoundsRect(gfx::Rect(
-      gfx::PointAtOffsetFromOrigin(-scroll_offset_), GetContentsSize()));
-}
-
-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) {
-  // The MouseWheelEvent was changed to support both X and Y offsets
-  // recently, but the behavior of this function was retained to continue
-  // using Y offsets only. Might be good to simply scroll in both
-  // directions as in OverflowBubbleView::OnScrollEvent.
-  if (IsHorizontalAlignment())
-    ScrollByXOffset(-event.y_offset());
-  else
-    ScrollByYOffset(-event.y_offset());
-  Layout();
-
-  return true;
-}
-
-void OverflowBubbleView::OnScrollEvent(ui::ScrollEvent* event) {
-  ScrollByXOffset(-event->x_offset());
-  ScrollByYOffset(-event->y_offset());
-  Layout();
-  event->SetHandled();
-}
-
-gfx::Rect OverflowBubbleView::GetBubbleBounds() {
-  views::BubbleBorder* border = GetBubbleFrameView()->bubble_border();
-  gfx::Insets bubble_insets = border->GetInsets();
-
-  const int border_size =
-      views::BubbleBorder::is_arrow_on_horizontal(arrow()) ?
-      bubble_insets.left() : bubble_insets.top();
-  const int arrow_offset = border_size + kPadding + kLauncherViewLeadingInset +
-      ShelfLayoutManager::GetPreferredShelfSize() / 2;
-
-  const gfx::Size content_size = GetPreferredSize();
-  border->set_arrow_offset(arrow_offset);
-
-  const gfx::Rect anchor_rect = GetAnchorRect();
-  gfx::Rect bubble_rect = GetBubbleFrameView()->GetUpdatedWindowBounds(
-      anchor_rect,
-      content_size,
-      false);
-
-  gfx::Rect monitor_rect = Shell::GetScreen()->GetDisplayNearestPoint(
-      anchor_rect.CenterPoint()).work_area();
-
-  int offset = 0;
-  if (views::BubbleBorder::is_arrow_on_horizontal(arrow())) {
-    if (bubble_rect.x() < monitor_rect.x())
-      offset = monitor_rect.x() - bubble_rect.x();
-    else if (bubble_rect.right() > monitor_rect.right())
-      offset = monitor_rect.right() - bubble_rect.right();
-
-    bubble_rect.Offset(offset, 0);
-    border->set_arrow_offset(anchor_rect.CenterPoint().x() - bubble_rect.x());
-  } else {
-    if (bubble_rect.y() < monitor_rect.y())
-      offset = monitor_rect.y() - bubble_rect.y();
-    else if (bubble_rect.bottom() > monitor_rect.bottom())
-      offset =  monitor_rect.bottom() - bubble_rect.bottom();
-
-    bubble_rect.Offset(0, offset);
-    border->set_arrow_offset(anchor_rect.CenterPoint().y() - bubble_rect.y());
-  }
-
-  GetBubbleFrameView()->SchedulePaint();
-  return bubble_rect;
-}
-
-}  // namespace
-
-OverflowBubble::OverflowBubble()
-    : bubble_(NULL),
-      launcher_view_(NULL) {
-}
-
-OverflowBubble::~OverflowBubble() {
-  Hide();
-}
-
-void OverflowBubble::Show(views::View* anchor, LauncherView* launcher_view) {
-  Hide();
-
-  OverflowBubbleView* bubble_view = new OverflowBubbleView();
-  bubble_view->InitOverflowBubble(anchor, launcher_view);
-  launcher_view_ = launcher_view;
-
-  bubble_ = bubble_view;
-  RootWindowController::ForWindow(anchor->GetWidget()->GetNativeView())->
-      GetSystemTray()->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;
-  launcher_view_ = NULL;
-}
-
-void OverflowBubble::OnWidgetDestroying(views::Widget* widget) {
-  DCHECK(widget == bubble_->GetWidget());
-  bubble_ = NULL;
-  launcher_view_ = NULL;
-  ShelfLayoutManager::ForLauncher(
-      widget->GetNativeView())->shelf_widget()->launcher()->SchedulePaint();
-}
-
-}  // namespace internal
-}  // namespace ash