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

Unified Diff: ash/shell/shell_delegate_impl.cc

Issue 22465007: Whitelist virtual keyboard container to process events at login screen (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move keyboard_controller_proxy_stub from ash/shell to ash/ Created 7 years, 4 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 | « ash/root_window_controller_unittest.cc ('k') | ash/shell_window_ids.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/shell_delegate_impl.cc
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 20d0a7f65f6008337d564819f86cf96695ac2e0d..471f5acbb50d7c463d9f8b5c3b5ec44190c6cb01 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -8,6 +8,7 @@
#include "ash/caps_lock_delegate_stub.h"
#include "ash/host/root_window_host_factory.h"
+#include "ash/keyboard_controller_proxy_stub.h"
#include "ash/session_state_delegate.h"
#include "ash/session_state_delegate_stub.h"
#include "ash/shell/context_menu.h"
@@ -18,39 +19,9 @@
#include "ash/wm/window_util.h"
#include "base/message_loop/message_loop.h"
#include "ui/aura/window.h"
-#include "ui/keyboard/keyboard_controller_proxy.h"
#include "ui/views/corewm/input_method_event_filter.h"
namespace ash {
-
-namespace {
-
-class DummyKeyboardControllerProxy : public keyboard::KeyboardControllerProxy {
- public:
- DummyKeyboardControllerProxy() {}
- virtual ~DummyKeyboardControllerProxy() {}
-
- private:
- // Overridden from keyboard::KeyboardControllerProxy:
- virtual content::BrowserContext* GetBrowserContext() OVERRIDE {
- return Shell::GetInstance()->browser_context();
- }
-
- virtual ui::InputMethod* GetInputMethod() OVERRIDE {
- return Shell::GetInstance()->input_method_filter()->input_method();
- }
-
- virtual void RequestAudioInput(content::WebContents* web_contents,
- const content::MediaStreamRequest& request,
- const content::MediaResponseCallback& callback) OVERRIDE {
- return;
- }
-
- DISALLOW_COPY_AND_ASSIGN(DummyKeyboardControllerProxy);
-};
-
-} // namespace
-
namespace shell {
ShellDelegateImpl::ShellDelegateImpl()
@@ -128,7 +99,7 @@ void ShellDelegateImpl::ShowKeyboardOverlay() {
keyboard::KeyboardControllerProxy*
ShellDelegateImpl::CreateKeyboardControllerProxy() {
- return new DummyKeyboardControllerProxy();
+ return new KeyboardControllerProxyStub();
}
void ShellDelegateImpl::ShowTaskManager() {
« no previous file with comments | « ash/root_window_controller_unittest.cc ('k') | ash/shell_window_ids.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698