Revert 64857 - Merge 64709 - 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).

** On release branch 552, unmodified F8/F9/F10 keys are not being grabbed properly **

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

TBR=davej@chromium.org
Review URL: http://codereview.chromium.org/4334002

TBR=davej@chromium.org
Review URL: http://codereview.chromium.org/4398001

git-svn-id: svn://svn.chromium.org/chrome/branches/552/src@64944 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc
index 9c0d868..c503ab9 100644
--- a/chrome/browser/browser_init.cc
+++ b/chrome/browser/browser_init.cc
@@ -402,10 +402,6 @@ 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();
 
@@ -444,6 +440,10 @@ 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;