Move a lot of ChromeOS stuff out of Browser and onto various Ash-related helpers.

BUG=none
TEST=none
TBR=davemoore
Review URL: https://chromiumcodereview.appspot.com/10035061

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

3 files changed, 15 insertions, 12 deletions

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index a72c7d2..0af9e59 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -110,18 +110,17 @@ void HandleCycleWindowLinear(ash::WindowCycleController::Direction direction) {
 
 #if defined(OS_CHROMEOS)
 bool HandleLock() {
-  ash::ShellDelegate* delegate = ash::Shell::GetInstance()->delegate();
-  if (!delegate)
-    return false;
-  delegate->LockScreen();
+  ash::Shell::GetInstance()->delegate()->LockScreen();
   return true;
 }
 
 bool HandleFileManager() {
-  ash::ShellDelegate* delegate = ash::Shell::GetInstance()->delegate();
-  if (!delegate)
-    return false;
-  delegate->OpenFileManager();
+  ash::Shell::GetInstance()->delegate()->OpenFileManager();
+  return true;
+}
+
+bool HandleCrosh() {
+  ash::Shell::GetInstance()->delegate()->OpenCrosh();
   return true;
 }
 #endif
@@ -346,6 +345,8 @@ bool AcceleratorController::AcceleratorPressed(
       return HandleLock();
     case OPEN_FILE_MANAGER:
       return HandleFileManager();
+    case OPEN_CROSH:
+      return HandleCrosh();
 #endif
     case EXIT:
       return HandleExit();
@@ -367,8 +368,8 @@ bool AcceleratorController::AcceleratorPressed(
       // Return true to prevent propagation of the key event because
       // this key combination is reserved for partial screenshot.
       return true;
-    case TOGGLE_APP_LIST:
-      ash::Shell::GetInstance()->ToggleAppList();
+    case SEARCH_KEY:
+      ash::Shell::GetInstance()->delegate()->Search();
       break;
     case TOGGLE_CAPS_LOCK:
       if (caps_lock_delegate_.get())
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index cf841b3..47690f9 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -39,6 +39,7 @@ const AcceleratorData kAcceleratorData[] = {
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_L, true, true, false, LOCK_SCREEN },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_M, false, true, false,
     OPEN_FILE_MANAGER },
+  { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_T, false, true, true, OPEN_CROSH },
 #endif
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_Q, true, true, false, EXIT },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_N, true, true, false,
@@ -54,7 +55,7 @@ const AcceleratorData kAcceleratorData[] = {
     TAKE_SCREENSHOT },
   // On Chrome OS, Search key is mapped to LWIN.
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_LWIN, false, true, false,
-    TOGGLE_APP_LIST },
+    SEARCH_KEY },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_LWIN, true, false, false,
     TOGGLE_CAPS_LOCK },
   { ui::ET_TRANSLATED_KEY_PRESS, ui::VKEY_F6, false, false, false,
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
index a960eee..1c072a3 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/accelerators/accelerator_table.h
@@ -25,7 +25,7 @@ enum AcceleratorAction {
   SWITCH_IME,  // Switch to another IME depending on the accelerator.
   TAKE_SCREENSHOT,
   TAKE_PARTIAL_SCREENSHOT,
-  TOGGLE_APP_LIST,
+  SEARCH_KEY,
   TOGGLE_CAPS_LOCK,
   VOLUME_DOWN,
   VOLUME_MUTE,
@@ -35,6 +35,7 @@ enum AcceleratorAction {
 #if defined(OS_CHROMEOS)
   LOCK_SCREEN,
   OPEN_FILE_MANAGER,
+  OPEN_CROSH,
 #endif
   SELECT_WIN_0,
   SELECT_WIN_1,