summaryrefslogtreecommitdiffstats
path: root/ash/shell_delegate.h
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 00:29:58 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 00:29:58 +0000
commitd10f5ae36b4ff727fe78ed10c9ca5673ad36fcb2 (patch)
tree493e30615d2f3f8353884d89d0bbe7a71aab44b0 /ash/shell_delegate.h
parent6c16475940a16572e1ecd093b96f6ad1e282725a (diff)
downloadchromium_src-d10f5ae36b4ff727fe78ed10c9ca5673ad36fcb2.zip
chromium_src-d10f5ae36b4ff727fe78ed10c9ca5673ad36fcb2.tar.gz
chromium_src-d10f5ae36b4ff727fe78ed10c9ca5673ad36fcb2.tar.bz2
chromeos: Simplify how chrome keeps track of caps lock state.
Notable changes: * Make caps-lock related tray-item explicitly chromeos-only, since there has never been an implementation of CapsLockDelegate for other platforms. * As a result, have the tray-item directly communicate with XKeyboard, instead of needing the CapsLockDelegate, so delete it. * Have the code that needs to know when the caps-lock state changes (e.g. TrayCapsLock, SigninScreenHandler) use a pre-target handler on Shell and look for VKEY_CAPITAL key-press events. This simplifies the code, which currently flows from: X11 -> SystemKeyEventListener -> SystemTrayDelegate -> SystemTrayNotifier -> TrayCapsLock to: X11 -> WindowTreeHost -> TrayCapsLock BUG=none R=derat@chromium.org, oshima@chromium.org, yusukes@chromium.org TBR=nkostylev@chromium.org for c/b/ui/webui/chromeos/login changes Review URL: https://codereview.chromium.org/192293004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256363 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell_delegate.h')
-rw-r--r--ash/shell_delegate.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index 7f27d21..ba28e0c 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -40,7 +40,6 @@ class KeyboardControllerProxy;
namespace ash {
class AccessibilityDelegate;
-class CapsLockDelegate;
class MediaDelegate;
class NewWindowDelegate;
class WindowTreeHostFactory;
@@ -105,9 +104,6 @@ class ASH_EXPORT ShellDelegate {
// Creates a user wallpaper delegate. Shell takes ownership of the delegate.
virtual UserWallpaperDelegate* CreateUserWallpaperDelegate() = 0;
- // Creates a caps lock delegate. Shell takes ownership of the delegate.
- virtual CapsLockDelegate* CreateCapsLockDelegate() = 0;
-
// Creates a session state delegate. Shell takes ownership of the delegate.
virtual SessionStateDelegate* CreateSessionStateDelegate() = 0;