diff options
| author | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 19:26:03 +0000 |
|---|---|---|
| committer | kevers@chromium.org <kevers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-07 19:26:03 +0000 |
| commit | a0b3fb8891adc6ffba760a91acae0c98b23c92a0 (patch) | |
| tree | 04ad1d49422b98ac6c0f52dd1c1c0b46530536fd /ash/shell.h | |
| parent | 6b6c0acee895c03e9aa71bb99b40ffb1e1f6cd13 (diff) | |
| download | chromium_src-a0b3fb8891adc6ffba760a91acae0c98b23c92a0.zip chromium_src-a0b3fb8891adc6ffba760a91acae0c98b23c92a0.tar.gz chromium_src-a0b3fb8891adc6ffba760a91acae0c98b23c92a0.tar.bz2 | |
Make keyboard controller a singleton.
BUG=358191
Review URL: https://codereview.chromium.org/219503003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@262177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ash/shell.h b/ash/shell.h index d506f87..098f333 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -47,10 +47,6 @@ class Point; class Rect; } -namespace keyboard { -class KeyboardController; -} - namespace ui { class Layer; class OutputConfigurator; @@ -328,10 +324,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, // Test if the MaximizeModeWindowManager is enabled or not. bool IsMaximizeModeWindowManagerEnabled(); - keyboard::KeyboardController* keyboard_controller() { - return keyboard_controller_.get(); - } - AcceleratorController* accelerator_controller() { return accelerator_controller_.get(); } @@ -619,7 +611,6 @@ class ASH_EXPORT Shell : public SystemModalContainerEventFilterDelegate, std::vector<WindowAndBoundsPair> to_restore_; scoped_ptr<UserMetricsRecorder> user_metrics_recorder_; - scoped_ptr<keyboard::KeyboardController> keyboard_controller_; scoped_ptr<NestedDispatcherController> nested_dispatcher_controller_; scoped_ptr<AcceleratorController> accelerator_controller_; scoped_ptr<ShellDelegate> delegate_; |