Add LockLayoutManager responsible for lock container (login/lock).

ash/wm/lock_layout_manager.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/wm/lock_layout_manager.h"
+
+#include "ash/shell.h"
+#include "ash/shell_delegate.h"
+#include "ash/wm/lock_window_state.h"
+#include "ash/wm/window_state.h"
+#include "ash/wm/wm_event.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_observer.h"
+#include "ui/events/event.h"
+
+using aura::Window;
+
+namespace ash {
+
+LockLayoutManager::LockLayoutManager(aura::Window* window)
+    : window_(window),
+      root_window_(window->GetRootWindow()),
+      is_observing_keyboard_(false) {
+  Shell::GetInstance()->delegate()->AddVirtualKeyboardStateObserver(this);
+  root_window_->AddObserver(this);
+  if (keyboard::KeyboardController::GetInstance()) {
+    keyboard::KeyboardController::GetInstance()->AddObserver(this);
+    is_observing_keyboard_ = true;
+  }
+}
+
+LockLayoutManager::~LockLayoutManager() {
+  if (root_window_)
+    root_window_->RemoveObserver(this);
+
+  for (WindowSet::const_iterator i = windows_.begin(); i != windows_.end(); ++i)
+    (*i)->RemoveObserver(this);
+
+  Shell::GetInstance()->delegate()->RemoveVirtualKeyboardStateObserver(this);
+
+  if (keyboard::KeyboardController::GetInstance() && is_observing_keyboard_) {
+    keyboard::KeyboardController::GetInstance()->RemoveObserver(this);
+    is_observing_keyboard_ = false;
+  }
+}
+
+void LockLayoutManager::WindowStateDestroyed(aura::Window* window) {
+  // At this time ForgetWindow() should already have been called. If not,
+  // someone else must have replaced the "window manager's state object".
+  DCHECK(!window->HasObserver(this));
+
+  WindowToState::iterator it = window_state_map_.find(window);
+  DCHECK(it != window_state_map_.end());
+  window_state_map_.erase(it);
+}
+
+void LockLayoutManager::OnWindowResized() {
+  const wm::WMEvent event(wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED);
+  AdjustWindowsForWorkAreaChange(&event);
+}
+
+void LockLayoutManager::OnWindowAddedToLayout(Window* child) {
+  windows_.insert(child);

[oshima, 2014/06/04 19:20:14]

do you need windows_? Isn't this same as window_->children() ?

+  child->AddObserver(this);
+

[oshima, 2014/06/03 22:36:44]

you should be able to just

wm::GetWindowState(child)->SetStateObject(lock_state)

and discard the old state. There should be no need to restore to old one. Then
you can eliminate most of memory management code.

I actually think you can just do the same in WorkspaceLayoutManager (for the
lock container), and it should work.

[Nikita (slow), 2014/06/04 04:17:00]

Ok, I'll do that.
I would like to avoid unnecessary logic in WorkspaceLayoutManager like

WorkspaceLayoutManager::OnDisplayWorkAreaInsetsChanged()
using incorrect work area definition.

And things like
UpdateFullscreenState();
UpdateShelfVisibility();

At the same time I would like to add a custom logic like tracking keyboard
container bounds so that LockContainer is not dependent indirectly on
ShelfLayoutManager changes etc.

[Nikita (slow), 2014/06/04 17:40:39]

Done.

+  window_state_map_[child] = new LockWindowState(child, this);

[oshima, 2014/06/04 19:20:14]

the following should work (no need to pass child to LockWindowState).

wm::WindowState* window_state = wm::GetWindowState(child);
window_state->SetStateobject(new LockWindowState);

(with proper scoped_ptr tricks)

and remove window_state_map_

[Nikita (slow), 2014/06/04 19:37:56]

SetStateobject is private. Ok to add LockLayoutManager as a friend instead of
LockWindowState?

+  wm::WindowState* window_state = wm::GetWindowState(child);
+  wm::WMEvent event(wm::WM_EVENT_ADDED_TO_WORKSPACE);
+  window_state->OnWMEvent(&event);
+}
+
+void LockLayoutManager::OnWillRemoveWindowFromLayout(Window* child) {
+  windows_.erase(child);
+  child->RemoveObserver(this);
+}
+
+void LockLayoutManager::OnWindowRemovedFromLayout(Window* child) {
+}
+
+void LockLayoutManager::OnChildWindowVisibilityChanged(Window* child,
+                                                       bool visible) {
+}
+
+void LockLayoutManager::SetChildBounds(
+    Window* child,
+    const gfx::Rect& requested_bounds) {
+  wm::WindowState* window_state = wm::GetWindowState(child);
+  wm::SetBoundsEvent event(wm::WM_EVENT_SET_BOUNDS, requested_bounds);
+  window_state->OnWMEvent(&event);
+}
+
+void LockLayoutManager::OnWindowHierarchyChanged(
+    const WindowObserver::HierarchyChangeParams& params) {
+}
+
+void LockLayoutManager::OnWindowPropertyChanged(Window* window,
+                                                const void* key,
+                                                intptr_t old) {
+}
+
+void LockLayoutManager::OnWindowStackingChanged(aura::Window* window) {
+}
+
+void LockLayoutManager::OnWindowDestroying(aura::Window* window) {
+  if (root_window_ == window) {
+    root_window_->RemoveObserver(this);
+    root_window_ = NULL;
+  } else {
+    ForgetWindow(window);
+  }
+}
+
+void LockLayoutManager::OnWindowBoundsChanged(aura::Window* window,
+                                              const gfx::Rect& old_bounds,
+                                              const gfx::Rect& new_bounds) {
+  if (root_window_ == window) {
+    const wm::WMEvent wm_event(wm::WM_EVENT_DISPLAY_BOUNDS_CHANGED);
+    AdjustWindowsForWorkAreaChange(&wm_event);
+  }
+}
+
+void LockLayoutManager::OnVirtualKeyboardStateChanged(bool activated) {
+  if (keyboard::KeyboardController::GetInstance()) {
+    if (activated) {
+      if (!is_observing_keyboard_) {
+        keyboard::KeyboardController::GetInstance()->AddObserver(this);
+        is_observing_keyboard_ = true;
+      }
+    } else {
+      keyboard::KeyboardController::GetInstance()->RemoveObserver(this);
+      is_observing_keyboard_ = false;
+    }
+  }
+}
+
+void LockLayoutManager::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {
+  keyboard_bounds_ = new_bounds;
+  OnWindowResized();
+}
+
+void LockLayoutManager::AdjustWindowsForWorkAreaChange(
+    const wm::WMEvent* event) {
+  for (WindowToState::iterator it = window_state_map_.begin();
+       it != window_state_map_.end();
+       ++it) {
+    wm::GetWindowState(it->first)->OnWMEvent(event);
+  }

[oshima, 2014/06/04 19:20:14]

this should be equivalent to 

for (child in window_->children())
   wm::GetWindowState(child)->OnWMEvent(event);

[Nikita (slow), 2014/06/05 10:51:37]

Done.

+
+  DCHECK(event->type() == wm::WM_EVENT_DISPLAY_BOUNDS_CHANGED ||
+         event->type() == wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED);
+
+  // If a user plugs an external display into a laptop running Aura the
+  // display size will change.  Maximized windows need to resize to match.
+  // We also do this when developers running Aura on a desktop manually resize
+  // the host window.
+  // We also need to do this when the work area insets changes.
+  for (WindowSet::const_iterator it = windows_.begin();
+       it != windows_.end();
+       ++it) {
+    wm::GetWindowState(*it)->OnWMEvent(event);
+  }
+}
+
+void LockLayoutManager::ForgetWindow(aura::Window* window) {
+  WindowToState::iterator it = window_state_map_.find(window);
+
+  // The following DCHECK could fail if our window state object was destroyed
+  // earlier by someone else. However - at this point there is no other client
+  // which replaces the state object and therefore this should not happen.
+  DCHECK(it != window_state_map_.end());
+  window->RemoveObserver(this);
+
+  // By telling the state object to revert, it will switch back the old
+  // State object and destroy itself, calling WindowStateDerstroyed().
+  it->second->RestoreWindowState(wm::GetWindowState(it->first));
+  DCHECK(window_state_map_.find(window) == window_state_map_.end());
+}
+
+}  // namespace ash