mash: Migrate ShelfTooltipManager to wm common types.

ash/shelf/shelf_tooltip_manager.cc

Index: ash/shelf/shelf_tooltip_manager.cc
diff --git a/ash/shelf/shelf_tooltip_manager.cc b/ash/shelf/shelf_tooltip_manager.cc
index 35a83a23d6808631583798d291725a3777f2df40..574f8cee5a74d277efa27dffc74678a863ecf6da 100644
--- a/ash/shelf/shelf_tooltip_manager.cc
+++ b/ash/shelf/shelf_tooltip_manager.cc
@@ -4,12 +4,13 @@
 
 #include "ash/shelf/shelf_tooltip_manager.h"
 
+#include "ash/common/shelf/wm_shelf.h"
 #include "ash/common/shell_window_ids.h"
-#include "ash/shelf/shelf.h"
-#include "ash/shelf/shelf_layout_manager.h"
+#include "ash/common/wm_lookup.h"
+#include "ash/common/wm_root_window_controller.h"
+#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
 #include "ash/shelf/shelf_view.h"
-#include "ash/shell.h"
-#include "ash/wm/window_animations.h"
 #include "base/bind.h"
 #include "base/strings/string16.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ -22,7 +23,6 @@
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/widget/widget.h"
-#include "ui/wm/core/window_animations.h"
 
 namespace ash {
 namespace {
@@ -53,8 +53,7 @@ class ShelfTooltipManager::ShelfTooltipBubble
                      views::BubbleBorder::Arrow arrow,
                      const base::string16& text)
       : views::BubbleDialogDelegateView(anchor, arrow) {
-    gfx::Insets insets =
-        gfx::Insets(kArrowOffsetTopBottom, kArrowOffsetLeftRight);
+    gfx::Insets insets(kArrowOffsetTopBottom, kArrowOffsetLeftRight);
     // Adjust the anchor location for asymmetrical borders of shelf item.
     if (anchor->border())
       insets += anchor->border()->GetInsets();
@@ -66,12 +65,6 @@ class ShelfTooltipManager::ShelfTooltipBubble
     set_margins(gfx::Insets(kTooltipTopBottomMargin, kTooltipLeftRightMargin));
     set_shadow(views::BubbleBorder::SMALL_SHADOW);
     SetLayoutManager(new views::FillLayout());
-    // The anchor may not have the widget in tests.
-    if (anchor->GetWidget() && anchor->GetWidget()->GetNativeWindow()) {
-      set_parent_window(ash::Shell::GetContainer(
-          anchor->GetWidget()->GetNativeWindow()->GetRootWindow(),
-          ash::kShellWindowId_SettingBubbleContainer));
-    }
     views::Label* label = new views::Label(text);
     label->SetHorizontalAlignment(gfx::ALIGN_LEFT);
     label->SetEnabledColor(kTooltipTextColor);
@@ -87,6 +80,16 @@ class ShelfTooltipManager::ShelfTooltipBubble
                      std::max(size.height(), kTooltipMinHeight));
   }
 
+  void OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
+                                views::Widget* bubble_widget) const override {
+    // Place the bubble in the same display as the anchor.
+    WmLookup::Get()
+        ->GetWindowForWidget(anchor_widget())
+        ->GetRootWindowController()
+        ->ConfigureWidgetInitParamsForContainer(
+            bubble_widget, kShellWindowId_SettingBubbleContainer, params);
+  }
+
   int GetDialogButtons() const override { return ui::DIALOG_BUTTON_NONE; }
 
   DISALLOW_COPY_AND_ASSIGN(ShelfTooltipBubble);
@@ -95,32 +98,21 @@ class ShelfTooltipManager::ShelfTooltipBubble
 ShelfTooltipManager::ShelfTooltipManager(ShelfView* shelf_view)
     : timer_delay_(kTooltipAppearanceDelay),
       shelf_view_(shelf_view),
-      root_window_(nullptr),
-      shelf_layout_manager_(nullptr),
       bubble_(nullptr),
-      weak_factory_(this) {}
+      weak_factory_(this) {
+  shelf_view_->wm_shelf()->AddObserver(this);
+  WmShell::Get()->AddPointerDownWatcher(this);
+}
 
 ShelfTooltipManager::~ShelfTooltipManager() {
-  WillDeleteShelfLayoutManager();
-
-  Shell::GetInstance()->RemovePointerWatcher(this);
-
-  if (root_window_) {
-    root_window_->RemoveObserver(this);
-    root_window_->RemovePreTargetHandler(this);
-    root_window_ = nullptr;
-  }
+  WmShell::Get()->RemovePointerDownWatcher(this);
+  shelf_view_->wm_shelf()->RemoveObserver(this);
+  if (shelf_view_->GetWidget() && shelf_view_->GetWidget()->GetNativeWindow())
+    shelf_view_->GetWidget()->GetNativeWindow()->PrependPreTargetHandler(this);

[James Cook, 2016/07/22 23:48:21]

Remove not prepend?

[msw, 2016/07/25 22:56:44]

Done.

 }
 
 void ShelfTooltipManager::Init() {
-  shelf_layout_manager_ = shelf_view_->shelf()->shelf_layout_manager();
-  shelf_layout_manager_->AddObserver(this);
-
-  root_window_ = shelf_view_->GetWidget()->GetNativeWindow()->GetRootWindow();
-  root_window_->AddPreTargetHandler(this);
-  root_window_->AddObserver(this);
-
-  Shell::GetInstance()->AddPointerWatcher(this);
+  shelf_view_->GetWidget()->GetNativeWindow()->PrependPreTargetHandler(this);
 }
 
 void ShelfTooltipManager::Close() {
@@ -142,26 +134,35 @@ void ShelfTooltipManager::ShowTooltip(views::View* view) {
   timer_.Stop();
   if (bubble_) {
     // Cancel the hiding animation to hide the old bubble immediately.
-    gfx::NativeView native_view = bubble_->GetWidget()->GetNativeView();
-    ::wm::SetWindowVisibilityAnimationTransition(native_view,
-                                                 ::wm::ANIMATE_NONE);
+    WmLookup::Get()
+        ->GetWindowForWidget(bubble_->GetWidget())
+        ->SetVisibilityAnimationTransition(::wm::ANIMATE_NONE);
     Close();
   }
 
   if (!ShouldShowTooltipForView(view))
     return;
 
-  Shelf* shelf = shelf_view_->shelf();
-  views::BubbleBorder::Arrow arrow = shelf->SelectValueForShelfAlignment(

[James Cook, 2016/07/22 23:48:21]

Aside, not for this CL, do you think we should port SelectValueForShelfAlignment
to WmShelf?  I don't feel strongly about it, which is why I haven't done it. :-)

[msw, 2016/07/25 22:56:44]

Maybe to ash/common/shelf/wm_shelf_util.h? It's shorter than a switch, but less
self-evident which values are used for each alignment; I don't feel strongly.

-      views::BubbleBorder::BOTTOM_CENTER, views::BubbleBorder::LEFT_CENTER,
-      views::BubbleBorder::RIGHT_CENTER);
+  views::BubbleBorder::Arrow arrow = views::BubbleBorder::Arrow::NONE;
+  switch (shelf_view_->wm_shelf()->GetAlignment()) {
+    case SHELF_ALIGNMENT_BOTTOM:
+    case SHELF_ALIGNMENT_BOTTOM_LOCKED:
+      arrow = views::BubbleBorder::BOTTOM_CENTER;
+      break;
+    case SHELF_ALIGNMENT_LEFT:
+      arrow = views::BubbleBorder::LEFT_CENTER;
+      break;
+    case SHELF_ALIGNMENT_RIGHT:
+      arrow = views::BubbleBorder::RIGHT_CENTER;
+      break;
+  }
 
   base::string16 text = shelf_view_->GetTitleForView(view);
   bubble_ = new ShelfTooltipBubble(view, arrow, text);
-  gfx::NativeView native_view = bubble_->GetWidget()->GetNativeView();
-  ::wm::SetWindowVisibilityAnimationType(
-      native_view, ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
-  ::wm::SetWindowVisibilityAnimationTransition(native_view, ::wm::ANIMATE_HIDE);
+  WmWindow* window = WmLookup::Get()->GetWindowForWidget(bubble_->GetWidget());
+  window->SetVisibilityAnimationType(
+      ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
+  window->SetVisibilityAnimationTransition(::wm::ANIMATE_HIDE);
   bubble_->GetWidget()->Show();
 }
 
@@ -187,24 +188,17 @@ void ShelfTooltipManager::OnTouchPressed(const ui::TouchEvent& event,
   Close();
 }
 
-void ShelfTooltipManager::OnEvent(ui::Event* event) {
-  // Mouse and touch press events are handled via views::PointerWatcher.
-  if (event->type() == ui::ET_MOUSE_PRESSED ||
-      event->type() == ui::ET_TOUCH_PRESSED) {
+void ShelfTooltipManager::OnMouseEvent(ui::MouseEvent* event) {
+  DCHECK_EQ(shelf_view_->GetWidget()->GetNativeWindow(), event->target());
+  if (event->type() == ui::ET_MOUSE_EXITED) {
+    Close();
     return;
   }
 
-  if (event->type() == ui::ET_MOUSE_EXITED || !event->IsMouseEvent() ||
-      event->target() != shelf_view_->GetWidget()->GetNativeWindow()) {
-    if (!event->IsKeyEvent())
-      Close();
+  if (event->type() != ui::ET_MOUSE_MOVED)
     return;
-  }
 
-  gfx::Point point = static_cast<ui::LocatedEvent*>(event)->location();
-  aura::Window::ConvertPointToTarget(
-      static_cast<aura::Window*>(event->target()),
-      shelf_view_->GetWidget()->GetNativeWindow(), &point);
+  gfx::Point point = event->AsLocatedEvent()->location();
   views::View::ConvertPointFromWidget(shelf_view_, &point);
   views::View* view = shelf_view_->GetTooltipHandlerForPoint(point);
   const bool should_show = ShouldShowTooltipForView(view);
@@ -212,27 +206,12 @@ void ShelfTooltipManager::OnEvent(ui::Event* event) {
   timer_.Stop();
   if (IsVisible() && should_show && bubble_->GetAnchorView() != view)
     ShowTooltip(view);
-  else if (!IsVisible() && should_show && event->type() == ui::ET_MOUSE_MOVED)
+  else if (!IsVisible() && should_show)
     ShowTooltipWithDelay(view);
   else if (IsVisible() && shelf_view_->ShouldHideTooltip(point))
     Close();
 }
 
-void ShelfTooltipManager::OnWindowDestroying(aura::Window* window) {
-  if (window == root_window_) {
-    root_window_->RemoveObserver(this);
-    root_window_->RemovePreTargetHandler(this);
-    root_window_ = nullptr;
-  }
-}
-
-void ShelfTooltipManager::WillDeleteShelfLayoutManager() {
-  if (shelf_layout_manager_)
-    shelf_layout_manager_->RemoveObserver(this);
-  shelf_layout_manager_ = nullptr;
-  shelf_view_ = nullptr;
-}
-

[James Cook, 2016/07/22 23:48:21]

It's so nice that you can get rid of these.

[msw, 2016/07/25 22:56:44]

Acknowledged.

 void ShelfTooltipManager::WillChangeVisibilityState(
     ShelfVisibilityState new_state) {
   if (new_state == SHELF_HIDDEN)
@@ -253,7 +232,7 @@ void ShelfTooltipManager::OnAutoHideStateChanged(ShelfAutoHideState new_state) {
 
 bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) {
   return shelf_view_ && shelf_view_->ShouldShowTooltipForView(view) &&
-         shelf_layout_manager_ && shelf_layout_manager_->IsVisible();
+         shelf_view_->wm_shelf()->GetVisibilityState() == SHELF_VISIBLE;
 }
 
 }  // namespace ash