Ports LockLayoutManager/LockWindowState to ash/common

ash/common/wm/lock_layout_manager.h

 // 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.
 
-#ifndef ASH_WM_LOCK_LAYOUT_MANAGER_H_
-#define ASH_WM_LOCK_LAYOUT_MANAGER_H_
+#ifndef ASH_COMMON_WM_LOCK_LAYOUT_MANAGER_H_
+#define ASH_COMMON_WM_LOCK_LAYOUT_MANAGER_H_
 
 #include "ash/ash_export.h"
 #include "ash/common/shell_observer.h"
+#include "ash/common/wm/wm_snap_to_pixel_layout_manager.h"
 #include "ash/common/wm/wm_types.h"
-#include "ash/snap_to_pixel_layout_manager.h"
+#include "ash/common/wm_window_observer.h"
 #include "base/macros.h"
-#include "ui/aura/layout_manager.h"
-#include "ui/aura/window_observer.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_controller_observer.h"
 
-namespace aura {
-class RootWindow;
-class Window;
-}
-
-namespace ui {
-class Layer;
-}
-
 namespace ash {
 namespace wm {
 class WindowState;
 class WMEvent;
 }
 
 // LockLayoutManager is used for the windows created in LockScreenContainer.
 // For Chrome OS this includes out-of-box/login/lock/multi-profile login use
 // cases. LockScreenContainer does not use default work area definition.
 // By default work area is defined as display area minus shelf, docked windows
 // and minus virtual keyboard bounds.
 // For windows in LockScreenContainer work area is display area minus virtual
 // keyboard bounds (only if keyboard overscroll is disabled). If keyboard
 // overscroll is enabled then work area always equals to display area size since
 // virtual keyboard changes inner workspace of each WebContents.
 // For all windows in LockScreenContainer default wm::WindowState is replaced
 // with LockWindowState.
 class ASH_EXPORT LockLayoutManager
-    : public SnapToPixelLayoutManager,
-      public aura::WindowObserver,
+    : public wm::WmSnapToPixelLayoutManager,
+      public WmWindowObserver,
       public ShellObserver,
       public keyboard::KeyboardControllerObserver {
  public:
-  explicit LockLayoutManager(aura::Window* window);
+  explicit LockLayoutManager(WmWindow* window);
   ~LockLayoutManager() override;
 
-  // Overridden from aura::LayoutManager:
+  // Overridden from WmSnapToPixelLayoutManager:
   void OnWindowResized() override;
-  void OnWindowAddedToLayout(aura::Window* child) override;
-  void OnWillRemoveWindowFromLayout(aura::Window* child) override;
-  void OnWindowRemovedFromLayout(aura::Window* child) override;
-  void OnChildWindowVisibilityChanged(aura::Window* child,
-                                      bool visibile) override;
-  void SetChildBounds(aura::Window* child,
+  void OnWindowAddedToLayout(WmWindow* child) override;
+  void OnWillRemoveWindowFromLayout(WmWindow* child) override;
+  void OnWindowRemovedFromLayout(WmWindow* child) override;
+  void OnChildWindowVisibilityChanged(WmWindow* child, bool visibile) override;
+  void SetChildBounds(WmWindow* child,
                       const gfx::Rect& requested_bounds) override;
 
-  // Overriden from aura::WindowObserver:
-  void OnWindowHierarchyChanged(
-      const WindowObserver::HierarchyChangeParams& params) override;
-  void OnWindowPropertyChanged(aura::Window* window,
-                               const void* key,
-                               intptr_t old) override;
-  void OnWindowStackingChanged(aura::Window* window) override;
-  void OnWindowDestroying(aura::Window* window) override;
-  void OnWindowBoundsChanged(aura::Window* window,
+  // Overriden from WmWindowObserver:

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

super-nit: "Overridden" or just WmWindowObserver:

+  void OnWindowDestroying(WmWindow* window) override;
+  void OnWindowBoundsChanged(WmWindow* window,
                              const gfx::Rect& old_bounds,
                              const gfx::Rect& new_bounds) override;
 
   // ShellObserver:
   void OnVirtualKeyboardStateChanged(bool activated) override;
 
   // keyboard::KeyboardControllerObserver overrides:
   void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
   void OnKeyboardClosed() override;
 
  private:
   // Adjusts the bounds of all managed windows when the display area changes.
   // This happens when the display size, work area insets has changed.
   void AdjustWindowsForWorkAreaChange(const wm::WMEvent* event);
 
-  aura::Window* window_;
-  aura::Window* root_window_;
+  WmWindow* window_;
+  WmWindow* root_window_;
 
   // True is subscribed as keyboard controller observer.
   bool is_observing_keyboard_;
 
   // The bounds of the keyboard.
   gfx::Rect keyboard_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(LockLayoutManager);
 };
 
 }  // namespace ash
 
-#endif  // ASH_WM_LOCK_LAYOUT_MANAGER_H_
+#endif  // ASH_COMMON_WM_LOCK_LAYOUT_MANAGER_H_