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

ash/display/screen_orientation_controller_chromeos.cc

 // Copyright 2014 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/display/screen_orientation_controller_chromeos.h"
 
 #include "ash/ash_switches.h"
 #include "ash/display/display_configuration_controller.h"
 #include "ash/shared/app_types.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/mru_window_tracker.h"
 #include "ash/wm/window_state.h"
-#include "ash/wm_window.h"
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "chromeos/accelerometer/accelerometer_reader.h"
 #include "chromeos/accelerometer/accelerometer_types.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/chromeos/accelerometer/accelerometer_util.h"
 #include "ui/display/display.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/wm/public/activation_client.h"
 
 namespace ash {
 
 namespace {
@@ skipping 132 matching lines @@
       current_rotation_(display::Display::ROTATE_0) {
   Shell::Get()->AddShellObserver(this);
 }
 
 ScreenOrientationController::~ScreenOrientationController() {
   Shell::Get()->RemoveShellObserver(this);
   chromeos::AccelerometerReader::GetInstance()->RemoveObserver(this);
   ShellPort::Get()->RemoveDisplayObserver(this);
   Shell::Get()->activation_client()->RemoveObserver(this);
   for (auto& windows : lock_info_map_)
-    windows.first->aura_window()->RemoveObserver(this);
+    windows.first->RemoveObserver(this);
 }
 
 void ScreenOrientationController::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void ScreenOrientationController::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 void ScreenOrientationController::LockOrientationForWindow(
-    WmWindow* requesting_window,
+    aura::Window* requesting_window,
     blink::WebScreenOrientationLockType lock_orientation,
     LockCompletionBehavior lock_completion_behavior) {
   if (lock_info_map_.empty())
     Shell::Get()->activation_client()->AddObserver(this);
 
-  if (!requesting_window->aura_window()->HasObserver(this))
-    requesting_window->aura_window()->AddObserver(this);
+  if (!requesting_window->HasObserver(this))
+    requesting_window->AddObserver(this);
   lock_info_map_[requesting_window] =
       LockInfo(lock_orientation, lock_completion_behavior);
 
   ApplyLockForActiveWindow();
 }
 
-void ScreenOrientationController::UnlockOrientationForWindow(WmWindow* window) {
+void ScreenOrientationController::UnlockOrientationForWindow(
+    aura::Window* window) {
   lock_info_map_.erase(window);
   if (lock_info_map_.empty())
     Shell::Get()->activation_client()->RemoveObserver(this);
-  window->aura_window()->RemoveObserver(this);
+  window->RemoveObserver(this);
   ApplyLockForActiveWindow();
 }
 
 void ScreenOrientationController::UnlockAll() {
   for (auto pair : lock_info_map_)
-    pair.first->aura_window()->RemoveObserver(this);
+    pair.first->RemoveObserver(this);
   lock_info_map_.clear();
   Shell::Get()->activation_client()->RemoveObserver(this);
   SetRotationLockedInternal(false);
   if (user_rotation_ != current_rotation_)
     SetDisplayRotation(user_rotation_, display::Display::ROTATION_SOURCE_USER);
 }
 
 bool ScreenOrientationController::ScreenOrientationProviderSupported() const {
   return Shell::Get()
       ->maximize_mode_controller()
@@ skipping 23 matching lines @@
   SetLockToOrientation(RotationToOrientation(rotation));
 }
 
 void ScreenOrientationController::OnWindowActivated(ActivationReason reason,
                                                     aura::Window* gained_active,
                                                     aura::Window* lost_active) {
   ApplyLockForActiveWindow();
 }
 
 void ScreenOrientationController::OnWindowDestroying(aura::Window* window) {
-  UnlockOrientationForWindow(WmWindow::Get(window));
+  UnlockOrientationForWindow(window);
 }
 
 // Currently contents::WebContents will only be able to lock rotation while
 // fullscreen. In this state a user cannot click on the tab strip to change. If
 // this becomes supported for non-fullscreen tabs then the following interferes
 // with TabDragController. OnWindowVisibilityChanged is called between a mouse
 // down and mouse up. The rotation this triggers leads to a coordinate space
 // change in the middle of an event. Causes the tab to separate from the tab
 // strip.
 void ScreenOrientationController::OnWindowVisibilityChanged(
     aura::Window* window,
     bool visible) {
-  if (lock_info_map_.find(WmWindow::Get(window)) == lock_info_map_.end())
+  if (lock_info_map_.find(window) == lock_info_map_.end())
     return;
   ApplyLockForActiveWindow();
 }
 
 void ScreenOrientationController::OnAccelerometerUpdated(
     scoped_refptr<const chromeos::AccelerometerUpdate> update) {
   if (rotation_locked_ && !CanRotateInLockedState())
     return;
   if (!update->has(chromeos::ACCELEROMETER_SOURCE_SCREEN))
     return;
@@ skipping 242 matching lines @@
   if (!display_manager->registered_internal_display_rotation_lock())
     return;
   user_locked_orientation_ = RotationToOrientation(
       display_manager->registered_internal_display_rotation());
 }
 
 void ScreenOrientationController::ApplyLockForActiveWindow() {
   MruWindowTracker::WindowList mru_windows(
       Shell::Get()->mru_window_tracker()->BuildMruWindowList());
 
-  for (WmWindow* window : mru_windows) {
-    if (!window->GetTargetVisibility())
+  for (auto* window : mru_windows) {
+    if (!window->TargetVisibility())
       continue;
     for (auto& pair : lock_info_map_) {
-      if (pair.first->GetTargetVisibility() && window->Contains(pair.first)) {
+      if (pair.first->TargetVisibility() && window->Contains(pair.first)) {
         LockRotationToOrientation(ResolveOrientationLock(
             pair.second.orientation, user_locked_orientation_));
         if (pair.second.lock_completion_behavior ==
             LockCompletionBehavior::DisableSensor) {
           pair.second.orientation = RotationToOrientation(current_rotation_);
           pair.second.lock_completion_behavior = LockCompletionBehavior::None;
           LockRotationToOrientation(pair.second.orientation);
         }
         return;
       }
     }
     // The default orientation for all chrome browser/apps windows is
     // ANY, so use the user_locked_orientation_;
-    if (window->GetTargetVisibility() &&
-        static_cast<AppType>(window->GetAppType()) != AppType::OTHERS) {
+    if (window->TargetVisibility() &&
+        static_cast<AppType>(window->GetProperty(aura::client::kAppType)) !=
+            AppType::OTHERS) {
       LockRotationToOrientation(user_locked_orientation_);
       return;
     }
   }
   LockRotationToOrientation(user_locked_orientation_);
 }
 
 bool ScreenOrientationController::IsRotationAllowedInLockedState(
     display::Display::Rotation rotation) {
   if (!rotation_locked_)
@@ skipping 18 matching lines @@
 }
 
 bool ScreenOrientationController::CanRotateInLockedState() {
   return rotation_locked_orientation_ ==
              blink::kWebScreenOrientationLockLandscape ||
          rotation_locked_orientation_ ==
              blink::kWebScreenOrientationLockPortrait;
 }
 
 }  // namespace ash