Adds an accelerator to handle Ctrl-Shift-L during weird cases

BUG=106873

Review URL: https://chromiumcodereview.appspot.com/9132004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118747 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 59 insertions, 1 deletions

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 943d296..d068eec 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -26,6 +26,9 @@ namespace {
 enum AcceleratorAction {
   CYCLE_BACKWARD,
   CYCLE_FORWARD,
+#if defined(OS_CHROMEOS)
+  LOCK_SCREEN,
+#endif
   EXIT,
   TAKE_SCREENSHOT,
   TOGGLE_CAPS_LOCK,
@@ -47,6 +50,9 @@ struct AcceleratorData {
   { ui::VKEY_TAB, false, false, true, CYCLE_FORWARD },
   { ui::VKEY_TAB, true, false, true, CYCLE_BACKWARD },
   { ui::VKEY_F5, false, false, false, CYCLE_FORWARD },
+#if defined(OS_CHROMEOS)
+  { ui::VKEY_L, true, true, false, LOCK_SCREEN },
+#endif
   { ui::VKEY_Q, true, true, false, EXIT },
   { ui::VKEY_F5, true, false, false, CYCLE_BACKWARD },
   { ui::VKEY_F5, false, true, false, TAKE_SCREENSHOT },
@@ -71,6 +77,16 @@ bool HandleCycleWindow(ash::WindowCycleController::Direction direction,
   return true;
 }
 
+#if defined(OS_CHROMEOS)
+bool HandleLock() {
+  ash::ShellDelegate* delegate = ash::Shell::GetInstance()->delegate();
+  if (!delegate)
+    return false;
+  delegate->LockScreen();
+  return true;
+}
+#endif
+
 bool HandleExit() {
   ash::ShellDelegate* delegate = ash::Shell::GetInstance()->delegate();
   if (!delegate)
@@ -197,6 +213,10 @@ bool AcceleratorController::AcceleratorPressed(
     case CYCLE_FORWARD:
       return HandleCycleWindow(WindowCycleController::FORWARD,
                                accelerator.IsAltDown());
+#if defined(OS_CHROMEOS)
+    case LOCK_SCREEN:
+      return HandleLock();
+#endif
     case EXIT:
       return HandleExit();
     case TAKE_SCREENSHOT:
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index a9cce71..91b3b9d 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -324,6 +324,11 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
   EXPECT_TRUE(GetController()->Process(
       ui::Accelerator(ui::VKEY_Q, true, true ,false)));
 #endif
+
+#if defined(OS_CHROMEOS)
+  EXPECT_TRUE(GetController()->Process(
+      ui::Accelerator(ui::VKEY_L, true, true, false)));
+#endif
 }
 
 }  // namespace test
diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc
index e0521b3..7456af1 100644
--- a/ash/shell/shell_main.cc
+++ b/ash/shell/shell_main.cc
@@ -58,6 +58,12 @@ class ShellDelegateImpl : public ash::ShellDelegate {
     return ash::internal::CreateStatusArea();
   }
 
+#if defined(OS_CHROMEOS)
+ virtual void LockScreen() OVERRIDE {
+   ash::shell::CreateLockScreen();
+ }
+#endif
+
   virtual void Exit() OVERRIDE {
     MessageLoopForUI::current()->Quit();
   }
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index 3be69cb..89acb92 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -56,6 +56,11 @@ class ASH_EXPORT ShellDelegate {
   // Invoked to create a new status area. Can return NULL.
   virtual views::Widget* CreateStatusArea() = 0;
 
+#if defined(OS_CHROMEOS)
+  // Invoked when a user uses Ctrl-Shift-L to lock the screen.
+  virtual void LockScreen() = 0;
+#endif
+
   // Invoked when a user uses Ctrl-Shift-Q to close chrome.
   virtual void Exit() = 0;
 
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index ef080e9..198f925 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -27,6 +27,11 @@ views::Widget* TestShellDelegate::CreateStatusArea() {
   return NULL;
 }
 
+#if defined(OS_CHROMEOS)
+void TestShellDelegate::LockScreen() {
+}
+#endif
+
 void TestShellDelegate::Exit() {
 }
 
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 9eedc96..b8e443e 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -20,6 +20,9 @@ class TestShellDelegate : public ShellDelegate {
   // Overridden from ShellDelegate:
   virtual void CreateNewWindow() OVERRIDE;
   virtual views::Widget* CreateStatusArea() OVERRIDE;
+#if defined(OS_CHROMEOS)
+  virtual void LockScreen() OVERRIDE;
+#endif
   virtual void Exit() OVERRIDE;
   virtual void BuildAppListModel(AppListModel* model) OVERRIDE;
   virtual AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;
diff --git a/chrome/browser/ui/views/accelerator_table.cc b/chrome/browser/ui/views/accelerator_table.cc
index 96f077e..2fee1df 100644
--- a/chrome/browser/ui/views/accelerator_table.cc
+++ b/chrome/browser/ui/views/accelerator_table.cc
@@ -90,7 +90,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
   { ui::VKEY_OEM_2,          false, true,  false, IDC_HELP_PAGE },
   { ui::VKEY_OEM_2,          true,  true,  false, IDC_HELP_PAGE },
 #endif
-#if defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) && !defined(USE_AURA)
   { ui::VKEY_L,              true,  true,  false, IDC_LOCK_SCREEN },
 #endif
   { ui::VKEY_I,              true,  true,  false, IDC_DEV_TOOLS },
diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
index 3cc14e3..c786776 100644
--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.cc
@@ -19,6 +19,10 @@
 #include "grit/theme_resources.h"
 #include "ui/aura/window.h"
 
+#if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
+#include "chrome/browser/chromeos/dbus/power_manager_client.h"
+#endif
 namespace {
 
 // Returns a list of Aura windows from a BrowserList, using either a
@@ -88,6 +92,13 @@ views::Widget* ChromeShellDelegate::CreateStatusArea() {
   return status_area_widget;
 }
 
+#if defined(OS_CHROMEOS)
+void ChromeShellDelegate::LockScreen() {
+  chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->
+      NotifyScreenLockRequested();
+}
+#endif
+
 void ChromeShellDelegate::Exit() {
   BrowserList::AttemptUserExit();
 }
diff --git a/chrome/browser/ui/views/aura/chrome_shell_delegate.h b/chrome/browser/ui/views/aura/chrome_shell_delegate.h
index 8bd55a4..5c7f87b 100644
--- a/chrome/browser/ui/views/aura/chrome_shell_delegate.h
+++ b/chrome/browser/ui/views/aura/chrome_shell_delegate.h
@@ -42,6 +42,9 @@ class ChromeShellDelegate : public ash::ShellDelegate {
   // ash::ShellDelegate overrides;
   virtual void CreateNewWindow() OVERRIDE;
   virtual views::Widget* CreateStatusArea() OVERRIDE;
+#if defined(OS_CHROMEOS)
+  virtual void LockScreen() OVERRIDE;
+#endif
   virtual void Exit() OVERRIDE;
   virtual void BuildAppListModel(ash::AppListModel* model) OVERRIDE;
   virtual ash::AppListViewDelegate* CreateAppListViewDelegate() OVERRIDE;