cros: Allow JS to control virtual keyboard on sign-in screen.

chrome/browser/chromeos/login/lock/webui_screen_locker.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 "chrome/browser/chromeos/login/lock/webui_screen_locker.h"
 
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/system/power/power_event_observer.h"
 #include "base/command_line.h"
@@ skipping 25 matching lines @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/aura/client/capture_client.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
-#include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_util.h"
 #include "ui/views/controls/webview/webview.h"
 
 namespace {
 
 // URL which corresponds to the login WebUI.
 const char kLoginURL[] = "chrome://oobe/lock";
 
 // Disables virtual keyboard overscroll. Login UI will scroll user pods
 // into view on JS side when virtual keyboard is shown.
@@ skipping 62 matching lines @@
 ////////////////////////////////////////////////////////////////////////////////
 // WebUIScreenLocker implementation.
 
 WebUIScreenLocker::WebUIScreenLocker(ScreenLocker* screen_locker)
     : WebUILoginView(BuildConfigSettings()),
       screen_locker_(screen_locker),
       network_state_helper_(new login::NetworkStateHelper),
       weak_factory_(this) {
   set_should_emit_login_prompt_visible(false);
   ash::ShellPort::Get()->AddLockStateObserver(this);
-  ash::Shell::Get()->AddShellObserver(this);
   display::Screen::GetScreen()->AddObserver(this);
   DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
-
-  if (keyboard::KeyboardController::GetInstance()) {
-    keyboard::KeyboardController::GetInstance()->AddObserver(this);
-    is_observing_keyboard_ = true;
-  }
 }
 
 WebUIScreenLocker::~WebUIScreenLocker() {
   DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
   display::Screen::GetScreen()->RemoveObserver(this);
   ash::ShellPort::Get()->RemoveLockStateObserver(this);
-  ash::Shell::Get()->RemoveShellObserver(this);
   // In case of shutdown, lock_window_ may be deleted before WebUIScreenLocker.
   if (lock_window_) {
     lock_window_->RemoveObserver(this);
     lock_window_->Close();
   }
   // If LockScreen() was called, we need to clear the signin screen handler
   // delegate set in ShowSigninScreen so that it no longer points to us.
   if (login_display_.get() && GetOobeUI())
     GetOobeUI()->ResetSigninScreenHandlerDelegate();
 
-  if (keyboard::KeyboardController::GetInstance() && is_observing_keyboard_) {
-    keyboard::KeyboardController::GetInstance()->RemoveObserver(this);
-    is_observing_keyboard_ = false;
-  }
-
   ResetKeyboardOverscrollOverride();
 
   RequestPreload();
 }
 
 void WebUIScreenLocker::LockScreen() {
   gfx::Rect bounds = display::Screen::GetScreen()->GetPrimaryDisplay().bounds();
 
   lock_time_ = base::TimeTicks::Now();
   lock_window_ = new LockWindow(this);
@@ skipping 238 matching lines @@
 
 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) {
   if (browser_shutdown::GetShutdownType() == browser_shutdown::NOT_VALID &&
       status != base::TERMINATION_STATUS_NORMAL_TERMINATION) {
     LOG(ERROR) << "Renderer crash on lock screen; signing out";
     Signout();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-// ash::ShellObserver:
-
-void WebUIScreenLocker::OnVirtualKeyboardStateChanged(
-    bool activated,
-    ash::WmWindow* root_window) {
-  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;
-    }
-  }
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// keyboard::KeyboardControllerObserver:
-
-void WebUIScreenLocker::OnKeyboardBoundsChanging(
-    const gfx::Rect& new_bounds) {
-  if (new_bounds.IsEmpty()) {
-    // Keyboard has been hidden.
-    if (GetOobeUI()) {
-      GetOobeUI()->GetCoreOobeView()->ShowControlBar(true);
-      GetOobeUI()->GetCoreOobeView()->ShowPinKeyboard(true);
-    }
-  } else {
-    // Keyboard has been shown.
-    if (GetOobeUI()) {
-      GetOobeUI()->GetCoreOobeView()->ShowControlBar(false);
-      GetOobeUI()->GetCoreOobeView()->ShowPinKeyboard(false);
-    }
-  }
-}
-
-void WebUIScreenLocker::OnKeyboardClosed() {}
-
-////////////////////////////////////////////////////////////////////////////////
 // display::DisplayObserver:
 
 void WebUIScreenLocker::OnDisplayAdded(const display::Display& new_display) {}
 
 void WebUIScreenLocker::OnDisplayRemoved(const display::Display& old_display) {}
 
 void WebUIScreenLocker::OnDisplayMetricsChanged(const display::Display& display,
                                                 uint32_t changed_metrics) {
   display::Display primary_display =
       display::Screen::GetScreen()->GetPrimaryDisplay();
   if (display.id() != primary_display.id() ||
       !(changed_metrics & DISPLAY_METRIC_BOUNDS)) {
     return;
   }
 
   if (GetOobeUI()) {
     const gfx::Size& size = primary_display.size();
     GetOobeUI()->GetCoreOobeView()->SetClientAreaSize(size.width(),
                                                       size.height());
   }
 }
 
 }  // namespace chromeos