summaryrefslogtreecommitdiffstats
path: root/athena
diff options
context:
space:
mode:
authorpkotwicz <pkotwicz@chromium.org>2014-11-18 16:07:36 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-19 00:07:53 +0000
commit8f7ebffc05e39acd69a92b33adacd289c895e269 (patch)
tree0a542fda4a3b9828c2b38c9d28f3ac81ecf08f90 /athena
parent9bbc20b286a526d650a291419a8bc0c73b45dffe (diff)
downloadchromium_src-8f7ebffc05e39acd69a92b33adacd289c895e269.zip
chromium_src-8f7ebffc05e39acd69a92b33adacd289c895e269.tar.gz
chromium_src-8f7ebffc05e39acd69a92b33adacd289c895e269.tar.bz2
Componentize AshKeyboardControllerProxy part1
This CL makes KeyboardControllerProxy take in a BrowserContext in the constructor. A new KeyboardControllerProxy is created via ash::Shell::CreateKeyboard() when the BrowserContext changes BUG=431448 TEST=None Review URL: https://codereview.chromium.org/711843002 Cr-Commit-Position: refs/heads/master@{#304707}
Diffstat (limited to 'athena')
-rw-r--r--athena/virtual_keyboard/virtual_keyboard_manager_impl.cc7
1 files changed, 1 insertions, 6 deletions
diff --git a/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc b/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
index 1d5e77d..30c2985 100644
--- a/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
+++ b/athena/virtual_keyboard/virtual_keyboard_manager_impl.cc
@@ -31,7 +31,7 @@ class BasicKeyboardControllerProxy : public keyboard::KeyboardControllerProxy {
public:
BasicKeyboardControllerProxy(content::BrowserContext* context,
aura::Window* root_window)
- : browser_context_(context), root_window_(root_window) {}
+ : keyboard::KeyboardControllerProxy(context), root_window_(root_window) {}
~BasicKeyboardControllerProxy() override {}
// keyboard::KeyboardControllerProxy:
@@ -46,14 +46,9 @@ class BasicKeyboardControllerProxy : public keyboard::KeyboardControllerProxy {
const content::MediaStreamRequest& request,
const content::MediaResponseCallback& callback) override {}
- virtual content::BrowserContext* GetBrowserContext() override {
- return browser_context_;
- }
-
virtual void SetUpdateInputType(ui::TextInputType type) override {}
private:
- content::BrowserContext* browser_context_;
aura::Window* root_window_;
DISALLOW_COPY_AND_ASSIGN(BasicKeyboardControllerProxy);