[mus+ash] Removes WmWindow from ash/wm/overview and ash/wm/workspace

ash/shelf/shelf_tooltip_manager.cc

 // Copyright 2013 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/shelf/shelf_tooltip_manager.h"
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf.h"
 #include "ash/shelf/shelf_view.h"
 #include "ash/shell_port.h"
 #include "ash/system/tray/tray_constants.h"
-#include "ash/wm_window.h"
+#include "ash/wm/window_util.h"
 #include "base/bind.h"
 #include "base/strings/string16.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/views/bubble/bubble_dialog_delegate.h"
 #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 {
 
 const int kTooltipAppearanceDelay = 1000;  // msec
 
 // Tooltip layout constants.
 
 // Shelf item tooltip height.
 const int kTooltipHeight = 24;
@@ skipping 65 matching lines @@
   gfx::Size CalculatePreferredSize() const override {
     const gfx::Size size = BubbleDialogDelegateView::GetPreferredSize();
     const int kTooltipMinHeight = kTooltipHeight - 2 * kTooltipTopBottomMargin;
     return gfx::Size(std::min(size.width(), kTooltipMaxWidth),
                      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.
-    WmWindow::Get(anchor_widget()->GetNativeWindow())
-        ->GetRootWindowController()
+    RootWindowController::ForWindow(anchor_widget()->GetNativeWindow())
         ->ConfigureWidgetInitParamsForContainer(
             bubble_widget, kShellWindowId_SettingBubbleContainer, params);
   }
 
   int GetDialogButtons() const override { return ui::DIALOG_BUTTON_NONE; }
 
   DISALLOW_COPY_AND_ASSIGN(ShelfTooltipBubble);
 };
 
 ShelfTooltipManager::ShelfTooltipManager(ShelfView* shelf_view)
     : timer_delay_(kTooltipAppearanceDelay),
       shelf_view_(shelf_view),
       bubble_(nullptr),
       weak_factory_(this) {
   shelf_view_->shelf()->AddObserver(this);
   ShellPort::Get()->AddPointerWatcher(this,
                                       views::PointerWatcherEventTypes::BASIC);
 }
 
 ShelfTooltipManager::~ShelfTooltipManager() {
   ShellPort::Get()->RemovePointerWatcher(this);
   shelf_view_->shelf()->RemoveObserver(this);
-  WmWindow* window = nullptr;
+  aura::Window* window = nullptr;
   if (shelf_view_->GetWidget())
-    window = WmWindow::Get(shelf_view_->GetWidget()->GetNativeWindow());
+    window = shelf_view_->GetWidget()->GetNativeWindow();
   if (window)
-    window->RemoveLimitedPreTargetHandler(this);
+    wm::RemoveLimitedPreTargetHandlerForWindow(this, window);
 }
 
 void ShelfTooltipManager::Init() {
-  WmWindow* window = WmWindow::Get(shelf_view_->GetWidget()->GetNativeWindow());
-  window->AddLimitedPreTargetHandler(this);
+  wm::AddLimitedPreTargetHandlerForWindow(
+      this, shelf_view_->GetWidget()->GetNativeWindow());
 }
 
 void ShelfTooltipManager::Close() {
   timer_.Stop();
   if (bubble_)
     bubble_->GetWidget()->Close();
   bubble_ = nullptr;
 }
 
 bool ShelfTooltipManager::IsVisible() const {
   return bubble_ && bubble_->GetWidget()->IsVisible();
 }
 
 views::View* ShelfTooltipManager::GetCurrentAnchorView() const {
   return bubble_ ? bubble_->GetAnchorView() : nullptr;
 }
 
 void ShelfTooltipManager::ShowTooltip(views::View* view) {
   timer_.Stop();
   if (bubble_) {
     // Cancel the hiding animation to hide the old bubble immediately.
-    WmWindow::Get(bubble_->GetWidget()->GetNativeWindow())
-        ->SetVisibilityAnimationTransition(::wm::ANIMATE_NONE);
+    ::wm::SetWindowVisibilityAnimationTransition(
+        bubble_->GetWidget()->GetNativeWindow(), ::wm::ANIMATE_NONE);
     Close();
   }
 
   if (!ShouldShowTooltipForView(view))
     return;
 
   views::BubbleBorder::Arrow arrow = views::BubbleBorder::Arrow::NONE;
   switch (shelf_view_->shelf()->alignment()) {
     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);
-  WmWindow* window = WmWindow::Get(bubble_->GetWidget()->GetNativeWindow());
-  window->SetVisibilityAnimationType(
-      ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
-  window->SetVisibilityAnimationTransition(::wm::ANIMATE_HIDE);
+  aura::Window* window = bubble_->GetWidget()->GetNativeWindow();
+  ::wm::SetWindowVisibilityAnimationType(
+      window, ::wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
+  ::wm::SetWindowVisibilityAnimationTransition(window, ::wm::ANIMATE_HIDE);
   bubble_->GetWidget()->Show();
 }
 
 void ShelfTooltipManager::ShowTooltipWithDelay(views::View* view) {
   if (ShouldShowTooltipForView(view)) {
     timer_.Start(FROM_HERE, base::TimeDelta::FromMilliseconds(timer_delay_),
                  base::Bind(&ShelfTooltipManager::ShowTooltip,
                             weak_factory_.GetWeakPtr(), view));
   }
 }
@@ skipping 50 matching lines @@
 
 bool ShelfTooltipManager::ShouldShowTooltipForView(views::View* view) {
   Shelf* shelf = shelf_view_ ? shelf_view_->shelf() : nullptr;
   return shelf && shelf_view_->ShouldShowTooltipForView(view) &&
          (shelf->GetVisibilityState() == SHELF_VISIBLE ||
           (shelf->GetVisibilityState() == SHELF_AUTO_HIDE &&
            shelf->GetAutoHideState() == SHELF_AUTO_HIDE_SHOWN));
 }
 
 }  // namespace ash