ash: Start/stop observing KeyboardController via ShellObserver

ash/common/wm/lock_layout_manager.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/common/wm/lock_layout_manager.h"
 
+#include "ash/common/keyboard/keyboard_observer_register.h"
 #include "ash/common/wm/lock_window_state.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_window.h"
 #include "ash/shell.h"
 #include "ui/events/event.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_util.h"
 
 namespace ash {
 
 LockLayoutManager::LockLayoutManager(WmWindow* window)
     : wm::WmSnapToPixelLayoutManager(),
       window_(window),
       root_window_(window->GetRootWindow()),
-      is_observing_keyboard_(false) {
+      keyboard_observer_(this) {
   Shell::GetInstance()->AddShellObserver(this);
   root_window_->aura_window()->AddObserver(this);
-  if (keyboard::KeyboardController::GetInstance()) {
-    keyboard::KeyboardController::GetInstance()->AddObserver(this);
-    is_observing_keyboard_ = true;
-  }
+  if (keyboard::KeyboardController::GetInstance())
+    keyboard_observer_.Add(keyboard::KeyboardController::GetInstance());
 }
 
 LockLayoutManager::~LockLayoutManager() {
   if (root_window_)
     root_window_->aura_window()->RemoveObserver(this);
 
   for (WmWindow* child : window_->GetChildren())
     child->aura_window()->RemoveObserver(this);
 
   Shell::GetInstance()->RemoveShellObserver(this);
-
-  if (keyboard::KeyboardController::GetInstance() && is_observing_keyboard_) {
-    keyboard::KeyboardController::GetInstance()->RemoveObserver(this);
-    is_observing_keyboard_ = false;
-  }
 }
 
 void LockLayoutManager::OnWindowResized() {
   const wm::WMEvent event(wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED);
   AdjustWindowsForWorkAreaChange(&event);
 }
 
 void LockLayoutManager::OnWindowAddedToLayout(WmWindow* child) {
   child->aura_window()->AddObserver(this);
 
@@ skipping 27 matching lines @@
 
 void LockLayoutManager::OnWindowBoundsChanged(aura::Window* window,
                                               const gfx::Rect& old_bounds,
                                               const gfx::Rect& new_bounds) {
   if (root_window_ == WmWindow::Get(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::OnVirtualKeyboardStateChanged(bool activated,
+                                                      WmWindow* root_window) {
+  UpdateKeyboardObserverFromStateChanged(activated, root_window, root_window_,
+                                         &keyboard_observer_);
 }
 
 void LockLayoutManager::OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) {
   keyboard_bounds_ = new_bounds;
   OnWindowResized();
 }
 
-void LockLayoutManager::OnKeyboardClosed() {}
+void LockLayoutManager::OnKeyboardClosed() {
+  keyboard_observer_.RemoveAll();
+}
 
 void LockLayoutManager::AdjustWindowsForWorkAreaChange(
     const wm::WMEvent* event) {
   DCHECK(event->type() == wm::WM_EVENT_DISPLAY_BOUNDS_CHANGED ||
          event->type() == wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED);
 
   for (WmWindow* child : window_->GetChildren())
     child->GetWindowState()->OnWMEvent(event);
 }
 
 }  // namespace ash