diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 00:59:59 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-28 00:59:59 +0000 |
| commit | f4c92b381a0aaba5f36c6f5afdac572bee389b39 (patch) | |
| tree | 90d68de6efd62ade78148dfa5b8af5f46a00be32 /ash/shell/shell_delegate_impl.cc | |
| parent | 76ab62b1527261a8547c59b7c81cf53a2af4b387 (diff) | |
| download | chromium_src-f4c92b381a0aaba5f36c6f5afdac572bee389b39.zip chromium_src-f4c92b381a0aaba5f36c6f5afdac572bee389b39.tar.gz chromium_src-f4c92b381a0aaba5f36c6f5afdac572bee389b39.tar.bz2 | |
Move functions for controlling Caps Lock to CapsLockDelegate from SystemTrayDelegate.
- Add functions for controlling Caps Lock to CapsLockDelegate
- Move the ownership of CapsLockDelegate to Shell from AcceleratorController
- Add ShellDelegate::CreateCapsLockDelegate
BUG=144474
Review URL: https://chromiumcodereview.appspot.com/10878058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153597 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell/shell_delegate_impl.cc')
| -rw-r--r-- | ash/shell/shell_delegate_impl.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index b7457e6..e6774c9 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc @@ -4,6 +4,7 @@ #include "ash/shell/shell_delegate_impl.h" +#include "ash/caps_lock_delegate_stub.h" #include "ash/shell/example_factory.h" #include "ash/shell/launcher_delegate_impl.h" #include "ash/shell/toplevel_window.h" @@ -123,6 +124,10 @@ ash::UserWallpaperDelegate* ShellDelegateImpl::CreateUserWallpaperDelegate() { return NULL; } +ash::CapsLockDelegate* ShellDelegateImpl::CreateCapsLockDelegate() { + return new CapsLockDelegateStub; +} + aura::client::UserActionClient* ShellDelegateImpl::CreateUserActionClient() { return NULL; } |