diff options
author | davej@chromium.org <davej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 02:06:06 +0000 |
---|---|---|
committer | davej@chromium.org <davej@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-02 02:06:06 +0000 |
commit | 3d962bbcd4148cf258c5dfdcb324b59f5ec8291b (patch) | |
tree | a5dd318c25b14ca943e69599e4a310fa0de614f5 /chrome/browser/browser_init.cc | |
parent | b2e4296c6bfac676bc886594054d8eb7388349a5 (diff) | |
download | chromium_src-3d962bbcd4148cf258c5dfdcb324b59f5ec8291b.zip chromium_src-3d962bbcd4148cf258c5dfdcb324b59f5ec8291b.tar.gz chromium_src-3d962bbcd4148cf258c5dfdcb324b59f5ec8291b.tar.bz2 |
Volume Up/Down/Mute are handled within Chrome itself, without depending on Window Manager. The SystemKeyEventListener keyboard filter is instantiated in screen_locker as well as browser_init, so these keys will be handled at the screen lock and when logged in.
The on-screen UI is shown when logged in, but currently is not being allowed to show at screen lock. (A screen lock can be forced with /usr/bin/powerd_lock_screen).
After this patch, keyboard handling within Chrome supersedes the key handling in window_manager.cc, and so that functionality can safely be removed (http://codereview.chromium.org/4159004) and chromeos_wm_ipc_enums.h (http://codereview.chromium.org/4172004).
BUG=chromium-os:6074
TEST=Volume Up/Down and Mute keys should work when screen is locked and when logged in normally.
Review URL: http://codereview.chromium.org/4098003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64709 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_init.cc')
-rw-r--r-- | chrome/browser/browser_init.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index c1ab3a9..228f092 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -403,6 +403,10 @@ bool BrowserInit::LaunchBrowser(const CommandLine& command_line, // of what window has focus. chromeos::WmMessageListener::instance(); + // Create the SystemKeyEventListener so it can listen for system keyboard + // messages regardless of focus. + chromeos::SystemKeyEventListener::instance(); + // Create the WmOverviewController so it can register with the listener. chromeos::WmOverviewController::instance(); @@ -441,10 +445,6 @@ bool BrowserInit::LaunchBrowser(const CommandLine& command_line, chromeos::CrosLibrary::Get()->GetNetworkLibrary()->AddObserver( chromeos::NetworkStateNotifier::Get()); - - // Creates the SystemKeyEventListener to listen for keypress messages - // regardless of what window has focus. - chromeos::SystemKeyEventListener::instance(); } #endif return true; |