Ports LockLayoutManager/LockWindowState to ash/common

ash/common/wm/lock_window_state.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/wm/lock_window_state.h"
+#include "ash/common/wm/lock_window_state.h"
 
 #include <utility>
 
-#include "ash/aura/wm_window_aura.h"
+#include "ash/common/wm/lock_layout_manager.h"
 #include "ash/common/wm/window_animation_types.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/window_state_delegate.h"
 #include "ash/common/wm/window_state_util.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm/wm_screen_util.h"
 #include "ash/common/wm_shell.h"
-#include "ash/display/display_manager.h"
-#include "ash/shell.h"
-#include "ash/wm/lock_layout_manager.h"
-#include "ash/wm/window_animations.h"
-#include "ash/wm/window_state_aura.h"
-#include "ash/wm/window_util.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_delegate.h"
+#include "ash/common/wm_window.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_util.h"
-#include "ui/wm/core/window_animations.h"
 
 namespace ash {
 
-LockWindowState::LockWindowState(aura::Window* window)
-    : current_state_type_(wm::GetWindowState(window)->GetStateType()) {}
+LockWindowState::LockWindowState(WmWindow* window)
+    : current_state_type_(window->GetWindowState()->GetStateType()) {}
 
 LockWindowState::~LockWindowState() {}
 
 void LockWindowState::OnWMEvent(wm::WindowState* window_state,
                                 const wm::WMEvent* event) {
   switch (event->type()) {
     case wm::WM_EVENT_TOGGLE_FULLSCREEN:
       ToggleFullScreen(window_state, window_state->delegate());
       break;
     case wm::WM_EVENT_FULLSCREEN:
@@ skipping 61 matching lines @@
   if (current_state_type_ != wm::WINDOW_STATE_TYPE_MAXIMIZED &&
       current_state_type_ != wm::WINDOW_STATE_TYPE_MINIMIZED &&
       current_state_type_ != wm::WINDOW_STATE_TYPE_FULLSCREEN) {
     UpdateWindow(window_state, GetMaximizedOrCenteredWindowType(window_state));
   }
 }
 
 void LockWindowState::DetachState(wm::WindowState* window_state) {}
 
 // static
-wm::WindowState* LockWindowState::SetLockWindowState(aura::Window* window) {
-  std::unique_ptr<wm::WindowState::State> lock_state(
-      new LockWindowState(window));
+wm::WindowState* LockWindowState::SetLockWindowState(WmWindow* window) {
+  std::unique_ptr<wm::WindowState::State> lock_state =
+      base::MakeUnique<LockWindowState>(window);
   std::unique_ptr<wm::WindowState::State> old_state(

[James Cook, 2016/09/20 18:22:47]

Aside: old_state is unused. Do you know if we have to do this to ignore the
return value?

-      wm::GetWindowState(window)->SetStateObject(std::move(lock_state)));
-  return wm::GetWindowState(window);
+      window->GetWindowState()->SetStateObject(std::move(lock_state)));
+  return window->GetWindowState();
 }
 
 void LockWindowState::UpdateWindow(wm::WindowState* window_state,
                                    wm::WindowStateType target_state) {
   DCHECK(target_state == wm::WINDOW_STATE_TYPE_MINIMIZED ||
          target_state == wm::WINDOW_STATE_TYPE_MAXIMIZED ||
          (target_state == wm::WINDOW_STATE_TYPE_NORMAL &&
           !window_state->CanMaximize()) ||
          target_state == wm::WINDOW_STATE_TYPE_FULLSCREEN);
 
@@ skipping 31 matching lines @@
     window_state->window()->Show();
   }
 }
 
 wm::WindowStateType LockWindowState::GetMaximizedOrCenteredWindowType(
     wm::WindowState* window_state) {
   return window_state->CanMaximize() ? wm::WINDOW_STATE_TYPE_MAXIMIZED
                                      : wm::WINDOW_STATE_TYPE_NORMAL;
 }
 
-gfx::Rect GetBoundsForLockWindow(aura::Window* window) {

[James Cook, 2016/09/20 18:22:47]

Hooray for dead code removal!

-  if (WmShell::Get()->IsInUnifiedMode())
-    return WmShell::Get()->GetFirstDisplay().bounds();
-  return wm::GetDisplayBoundsInParent(WmWindowAura::Get(window));
-}
-
 void LockWindowState::UpdateBounds(wm::WindowState* window_state) {
   if (!window_state->IsMaximized() && !window_state->IsFullscreen())
     return;
 
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   gfx::Rect keyboard_bounds;
 
   if (keyboard_controller && !keyboard::IsKeyboardOverscrollEnabled() &&
       keyboard_controller->keyboard_visible()) {
     keyboard_bounds = keyboard_controller->current_keyboard_bounds();
   }
   gfx::Rect bounds = wm::GetDisplayBoundsWithShelf(window_state->window());
   bounds.set_height(bounds.height() - keyboard_bounds.height());
 
   VLOG(1) << "Updating window bounds to: " << bounds.ToString();
   window_state->SetBoundsDirect(bounds);
 }
 
 }  // namespace ash