ash/chromeos: "Search" key to toggle app list.

- "Search" key to toggle app list;
- Remove old "Ctrl+Search" shortcut for app list;
- Remove ShellDelegate::Search since it no longer in use;

BUG=131703
TEST=Verify "Search" key toggles app list and old "Ctrl+Search" stops working.


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

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

8 files changed, 2 insertions, 18 deletions

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index d3ea484..4dca2ce 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -334,9 +334,6 @@ bool AcceleratorController::PerformAction(int action,
       // Return true to prevent propagation of the key event because
       // this key combination is reserved for partial screenshot.
       return true;
-    case SEARCH_KEY:
-      ash::Shell::GetInstance()->delegate()->Search();
-      return true;
     case TOGGLE_APP_LIST:
       ash::Shell::GetInstance()->ToggleAppList();
       return true;
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index 3493995..d9a2161 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -54,9 +54,8 @@ const AcceleratorData kAcceleratorData[] = {
     TAKE_PARTIAL_SCREENSHOT },
   { true, ui::VKEY_PRINT, ui::EF_NONE, TAKE_SCREENSHOT },
   // On Chrome OS, Search key is mapped to LWIN.
-  { true, ui::VKEY_LWIN, ui::EF_NONE, SEARCH_KEY },
-  { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, SEARCH_KEY },
-  { true, ui::VKEY_LWIN, ui::EF_CONTROL_DOWN, TOGGLE_APP_LIST },
+  { true, ui::VKEY_LWIN, ui::EF_NONE, TOGGLE_APP_LIST },
+  { true, ui::VKEY_BROWSER_SEARCH, ui::EF_NONE, TOGGLE_APP_LIST },
   { true, ui::VKEY_LWIN, ui::EF_SHIFT_DOWN, TOGGLE_CAPS_LOCK },
   { true, ui::VKEY_F6, ui::EF_NONE, BRIGHTNESS_DOWN },
   { true, ui::VKEY_F7, ui::EF_NONE, BRIGHTNESS_UP },
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
index 53461db..be17ec7 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/accelerators/accelerator_table.h
@@ -30,7 +30,6 @@ enum AcceleratorAction {
   PREVIOUS_IME,
   RESTORE_TAB,
   ROTATE_WINDOWS,
-  SEARCH_KEY,
   SELECT_LAST_WIN,
   SELECT_WIN_0,
   SELECT_WIN_1,
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index be403c8..59f68bd 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -66,9 +66,6 @@ void ShellDelegateImpl::NewWindow(bool incognito) {
   ash::shell::ToplevelWindow::CreateToplevelWindow(create_params);
 }
 
-void ShellDelegateImpl::Search() {
-}
-
 void ShellDelegateImpl::OpenFileManager() {
 }
 
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index a97522f..bc1e5be 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -30,7 +30,6 @@ class ShellDelegateImpl : public ash::ShellDelegate {
   virtual void Exit() OVERRIDE;
   virtual void NewTab() OVERRIDE;
   virtual void NewWindow(bool incognito) OVERRIDE;
-  virtual void Search() OVERRIDE;
   virtual void OpenFileManager() OVERRIDE;
   virtual void OpenCrosh() OVERRIDE;
   virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index 357b0f0..ea668fa 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -68,9 +68,6 @@ class ASH_EXPORT ShellDelegate {
   // Invoked when the user uses Ctrl-N or Ctrl-Shift-N to open a new window.
   virtual void NewWindow(bool incognito) = 0;
 
-  // Invoked when the user presses the Search key.
-  virtual void Search() = 0;
-
   // Invoked when the user uses Ctrl-M to open file manager.
   virtual void OpenFileManager() = 0;
 
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 5a290a1..3a47f5f 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -51,9 +51,6 @@ void TestShellDelegate::NewTab() {
 void TestShellDelegate::NewWindow(bool incognito) {
 }
 
-void TestShellDelegate::Search() {
-}
-
 void TestShellDelegate::OpenFileManager() {
 }
 
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index 4b349b6..9091e4e 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -26,7 +26,6 @@ class TestShellDelegate : public ShellDelegate {
   virtual void Exit() OVERRIDE;
   virtual void NewTab() OVERRIDE;
   virtual void NewWindow(bool incognito) OVERRIDE;
-  virtual void Search() OVERRIDE;
   virtual void OpenFileManager() OVERRIDE;
   virtual void OpenCrosh() OVERRIDE;
   virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;