Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(186)

Unified Diff: chrome/browser/chromeos/login/lock/webui_screen_locker.h

Issue 2814863002: cros: Allow JS to control virtual keyboard on sign-in screen. (Closed)
Patch Set: Remove login_display_host_impl.cc keyboard logic Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/lock/webui_screen_locker.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/lock/webui_screen_locker.h
diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.h b/chrome/browser/chromeos/login/lock/webui_screen_locker.h
index abac16e04cfdfd82332745fde42e89de5e4e81f0..fea1b725af96e579d7257b4e04397ee1cf7f67f2 100644
--- a/chrome/browser/chromeos/login/lock/webui_screen_locker.h
+++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.h
@@ -10,7 +10,6 @@
#include <memory>
#include <string>
-#include "ash/shell_observer.h"
#include "ash/wm/lock_state_observer.h"
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
@@ -23,7 +22,6 @@
#include "chromeos/dbus/power_manager_client.h"
#include "content/public/browser/web_contents_observer.h"
#include "ui/display/display_observer.h"
-#include "ui/keyboard/keyboard_controller_observer.h"
#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_observer.h"
@@ -50,8 +48,6 @@ class WebUIScreenLocker : public WebUILoginView,
public ash::LockStateObserver,
public views::WidgetObserver,
public PowerManagerClient::Observer,
- public ash::ShellObserver,
- public keyboard::KeyboardControllerObserver,
public display::DisplayObserver,
public content::WebContentsObserver {
public:
@@ -138,14 +134,6 @@ class WebUIScreenLocker : public WebUILoginView,
// content::WebContentsObserver:
void RenderProcessGone(base::TerminationStatus status) override;
- // ash::ShellObserver:
- void OnVirtualKeyboardStateChanged(bool activated,
- ash::WmWindow* root_window) override;
-
- // keyboard::KeyboardControllerObserver:
- void OnKeyboardBoundsChanging(const gfx::Rect& new_bounds) override;
- void OnKeyboardClosed() override;
-
// display::DisplayObserver:
void OnDisplayAdded(const display::Display& new_display) override;
void OnDisplayRemoved(const display::Display& old_display) override;
@@ -193,9 +181,6 @@ class WebUIScreenLocker : public WebUILoginView,
std::unique_ptr<login::NetworkStateHelper> network_state_helper_;
- // True iff this object is observing a keyboard controller.
- bool is_observing_keyboard_ = false;
-
base::WeakPtrFactory<WebUIScreenLocker> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(WebUIScreenLocker);
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/lock/webui_screen_locker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698