[mus+ash] Removes WmWindow from screen_dimmer and video_detector

ash/wallpaper/wallpaper_view.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/wallpaper/wallpaper_view.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wallpaper/wallpaper_controller.h"
 #include "ash/wallpaper/wallpaper_delegate.h"
 #include "ash/wallpaper/wallpaper_widget_controller.h"
 #include "ash/wm/overview/window_selector_controller.h"
-#include "ash/wm_window.h"
+#include "ui/aura/window.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/display/screen.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/safe_integer_conversions.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/transform.h"
 #include "ui/views/widget/widget.h"
+#include "ui/wm/core/window_animations.h"
 
 namespace ash {
 namespace {
 
 // A view that controls the child view's layer so that the layer always has the
 // same size as the display's original, un-scaled size in DIP. The layer is then
 // transformed to fit to the virtual screen size when laid-out. This is to avoid
 // scaling the image at painting time, then scaling it back to the screen size
 // in the compositor.
 class LayerControlView : public views::View {
  public:
   explicit LayerControlView(views::View* view) {
     AddChildView(view);
     view->SetPaintToLayer();
   }
 
   // Overrides views::View.
   void Layout() override {
-    WmWindow* window = WmWindow::Get(GetWidget()->GetNativeWindow());
+    aura::Window* window = GetWidget()->GetNativeWindow();
     // Keep |this| at the bottom since there may be other windows on top of the
     // wallpaper view such as an overview mode shield.
-    window->GetParent()->StackChildAtBottom(window);
-    display::Display display = window->GetDisplayNearestWindow();
+    window->parent()->StackChildAtBottom(window);
+    display::Display display =
+        display::Screen::GetScreen()->GetDisplayNearestWindow(window);
 
     // TODO(mash): Mash returns a fake ManagedDisplayInfo. crbug.com/622480
     float ui_scale = 1.f;
     display::ManagedDisplayInfo info =
         ShellPort::Get()->GetDisplayInfo(display.id());
     if (info.id() == display.id())
       ui_scale = info.GetEffectiveUIScale();
 
     gfx::Size rounded_size =
         gfx::ScaleToFlooredSize(display.size(), 1.f / ui_scale);
@@ skipping 127 matching lines @@
 bool WallpaperView::OnMousePressed(const ui::MouseEvent& event) {
   return true;
 }
 
 void WallpaperView::ShowContextMenuForView(views::View* source,
                                            const gfx::Point& point,
                                            ui::MenuSourceType source_type) {
   ShellPort::Get()->ShowContextMenu(point, source_type);
 }
 
-views::Widget* CreateWallpaper(WmWindow* root_window, int container_id) {
+views::Widget* CreateWallpaper(aura::Window* root_window, int container_id) {
   WallpaperController* controller = Shell::Get()->wallpaper_controller();
   WallpaperDelegate* wallpaper_delegate = Shell::Get()->wallpaper_delegate();
 
   views::Widget* wallpaper_widget = new views::Widget;
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.name = "WallpaperView";
   if (controller->GetWallpaper().isNull())
     params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
-  root_window->GetRootWindowController()->ConfigureWidgetInitParamsForContainer(
+  RootWindowController* root_window_controller =
+      RootWindowController::ForWindow(root_window);
+  root_window_controller->ConfigureWidgetInitParamsForContainer(
       wallpaper_widget, container_id, &params);
   wallpaper_widget->Init(params);
   wallpaper_widget->SetContentsView(new LayerControlView(new WallpaperView()));
   int animation_type = wallpaper_delegate->GetAnimationType();
-  WmWindow* wallpaper_window =
-      WmWindow::Get(wallpaper_widget->GetNativeWindow());
-  wallpaper_window->SetVisibilityAnimationType(animation_type);
-
-  RootWindowController* root_window_controller =
-      root_window->GetRootWindowController();
+  aura::Window* wallpaper_window = wallpaper_widget->GetNativeWindow();
+  ::wm::SetWindowVisibilityAnimationType(wallpaper_window, animation_type);
 
   // Enable wallpaper transition for the following cases:
   // 1. Initial(OOBE) wallpaper animation.
   // 2. Wallpaper fades in from a non empty background.
   // 3. From an empty background, chrome transit to a logged in user session.
   // 4. From an empty background, guest user logged in.
   if (wallpaper_delegate->ShouldShowInitialAnimation() ||
       root_window_controller->animating_wallpaper_widget_controller() ||
       Shell::Get()->session_controller()->NumberOfLoggedInUsers()) {
-    wallpaper_window->SetVisibilityAnimationTransition(::wm::ANIMATE_SHOW);
+    ::wm::SetWindowVisibilityAnimationTransition(wallpaper_window,
+                                                 ::wm::ANIMATE_SHOW);
     int duration_override = wallpaper_delegate->GetAnimationDurationOverride();
     if (duration_override) {
-      wallpaper_window->SetVisibilityAnimationDuration(
+      ::wm::SetWindowVisibilityAnimationDuration(
+          wallpaper_window,
           base::TimeDelta::FromMilliseconds(duration_override));
     }
   } else {
     // Disable animation if transition to login screen from an empty background.
-    wallpaper_window->SetVisibilityAnimationTransition(::wm::ANIMATE_NONE);
+    ::wm::SetWindowVisibilityAnimationTransition(wallpaper_window,
+                                                 ::wm::ANIMATE_NONE);
   }
 
-  WmWindow* container = root_window->GetChildByShellWindowId(container_id);
-  wallpaper_widget->SetBounds(container->GetBounds());
+  aura::Window* container = root_window->GetChildById(container_id);
+  wallpaper_widget->SetBounds(container->bounds());
   return wallpaper_widget;
 }
 
 }  // namespace ash