aura: Add Ctrl-Shift-Q for quit and Ctrl-Shift-L for lock in chromeos.

chrome/browser/chrome_browser_main_extra_parts_aura.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chrome_browser_main_extra_parts_aura.h"
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
 #include "chrome/browser/ui/views/aura/screen_orientation_listener.h"
 #include "chrome/browser/ui/views/aura/screenshot_taker.h"
+#include "content/public/browser/user_metrics.h"
 #include "ui/aura/root_window.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #endif
 
 #if defined(USE_WEBKIT_COMPOSITOR)
 #include "ui/gfx/compositor/compositor_setup.h"
 #else
 #include "ui/gfx/test/gfx_test_utils.h"
@@ skipping 15 matching lines @@
 #if defined(OS_CHROMEOS)
   if (chromeos::system::runtime_environment::IsRunningOnChromeOS())
     aura::RootWindow::set_use_fullscreen_host_window(true);
 #endif
 
   // Shell takes ownership of ChromeShellDelegate.
   ash::Shell* shell = ash::Shell::CreateInstance(new ChromeShellDelegate);
   // AcceleratorController takes ownership of ScreenshotDelegate.
   shell->accelerator_controller()->SetScreenshotDelegate(new ScreenshotTaker);
 
+  ui::Accelerator quit(ui::VKEY_Q, true, true, false);

[sky, 2012/01/19 05:02:12]

Do we already have global accelerators defined some where that these can be
defined with?

+  ui::Accelerator lock(ui::VKEY_L, true, true, false);
+  shell->accelerator_controller()->Register(quit, this);
+  shell->accelerator_controller()->Register(lock, this);
+
   // Make sure the singleton ScreenOrientationListener object is created.
   ScreenOrientationListener::GetInstance();
 }
 
 void ChromeBrowserMainExtraPartsAura::PostMainMessageLoopRun() {
   ash::Shell::DeleteInstance();
   aura::RootWindow::DeleteInstance();
 }
+
+bool ChromeBrowserMainExtraPartsAura::AcceleratorPressed(
+    const ui::Accelerator& accelerator) {
+  switch (accelerator.key_code()) {
+    case ui::VKEY_Q:
+      DCHECK_EQ(ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+                accelerator.modifiers());
+      content::RecordAction(content::UserMetricsAction("Exit"));
+      BrowserList::AttemptUserExit();
+      break;
+    case ui::VKEY_L:
+      DCHECK_EQ(ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
+                accelerator.modifiers());
+      content::RecordAction(content::UserMetricsAction("LockScreen"));
+      chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
+        NotifyScreenLockRequested();

[sky, 2012/01/19 05:02:12]

nit: spacing.

+      break;
+    default:
+      NOTREACHED();
+  }
+  return true;
+}
+
+bool ChromeBrowserMainExtraPartsAura::CanHandleAccelerators() const {
+  return true;
+}