Introduce window container to be used by lock screen app windows

ash/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 <memory>
 #include <utility>
 
 #include "ash/screen_util.h"
 #include "ash/wm/lock_layout_manager.h"
 #include "ash/wm/window_animation_types.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_delegate.h"
 #include "ash/wm/window_state_util.h"
 #include "ash/wm/wm_event.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_util.h"
+#include "ui/wm/core/coordinate_conversion.h"
 
 namespace ash {
 
-LockWindowState::LockWindowState(aura::Window* window)
-    : current_state_type_(wm::GetWindowState(window)->GetStateType()) {}
+LockWindowState::LockWindowState(aura::Window* window, bool shelf_visible)
+    : current_state_type_(wm::GetWindowState(window)->GetStateType()),
+      shelf_visible_(shelf_visible) {}
 
 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 62 matching lines @@
       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 =
-      base::MakeUnique<LockWindowState>(window);
+      base::MakeUnique<LockWindowState>(window, false);
   wm::WindowState* window_state = wm::GetWindowState(window);
   std::unique_ptr<wm::WindowState::State> old_state(
       window_state->SetStateObject(std::move(lock_state)));
+  return window_state;
+}
+
+// static
+wm::WindowState* LockWindowState::SetLockWindowStateWithVisibleShelf(
+    aura::Window* window) {
+  std::unique_ptr<wm::WindowState::State> lock_state =
+      base::MakeUnique<LockWindowState>(window, true);
+  wm::WindowState* window_state = wm::GetWindowState(window);
+  std::unique_ptr<wm::WindowState::State> old_state(
+      window_state->SetStateObject(std::move(lock_state)));
   return window_state;
 }
 
 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 32 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;
 }
 
-void LockWindowState::UpdateBounds(wm::WindowState* window_state) {
-  if (!window_state->IsMaximized() && !window_state->IsFullscreen())
-    return;
+gfx::Rect LockWindowState::GetWindowBounds(aura::Window* window) {
+  if (shelf_visible_)
+    return ScreenUtil::GetDisplayWorkAreaBoundsInParentForLockScreen(window);
 
   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 =
-      ScreenUtil::GetDisplayBoundsWithShelf(window_state->window());
-  bounds.set_height(bounds.height() - keyboard_bounds.height());
 
+  gfx::Rect bounds = ScreenUtil::GetDisplayBoundsWithShelf(window);
+  bounds.Inset(0, 0, 0, keyboard_bounds.height());
+  return bounds;
+}
+
+void LockWindowState::UpdateBounds(wm::WindowState* window_state) {
+  if (!window_state->IsMaximized() && !window_state->IsFullscreen())
+    return;
+
+  gfx::Rect bounds = GetWindowBounds(window_state->window());
   VLOG(1) << "Updating window bounds to: " << bounds.ToString();
   window_state->SetBoundsDirect(bounds);
 }
 
 }  // namespace ash