Remove Ash accelerator OPEN_FILE_DIALOG; let Chrome handle it as IDC_OPEN_FILE.

The Ctrl-O had once been handled as global shortcut, but now it is
no-op when no browser is open. It can be moved back to browser
shortcut, as it is handled in all other platforms than Chrome OS.

BUG=301445, 251492

Review URL: https://codereview.chromium.org/25225002

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

9 files changed, 8 insertions, 16 deletions

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index a6d0d49..89aed5b 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -173,8 +173,8 @@ bool HandleLock() {
   return true;
 }
 
-bool HandleFileManager(bool as_dialog) {
-  Shell::GetInstance()->delegate()->OpenFileManager(as_dialog);
+bool HandleFileManager() {
+  Shell::GetInstance()->delegate()->OpenFileManager();
   return true;
 }
 
@@ -571,10 +571,8 @@ bool AcceleratorController::PerformAction(int action,
       if (key_code == ui::VKEY_L)
         shell->delegate()->RecordUserMetricsAction(UMA_ACCEL_LOCK_SCREEN_L);
       return HandleLock();
-    case OPEN_FILE_DIALOG:
-      return HandleFileManager(true /* as_dialog */);
     case OPEN_FILE_MANAGER:
-      return HandleFileManager(false /* as_dialog */);
+      return HandleFileManager();
     case OPEN_CROSH:
       return HandleCrosh();
     case SILENCE_SPOKEN_FEEDBACK:
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index 341ab1f..c26e610 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -965,10 +965,6 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
       ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_SHIFT_DOWN)));
 
 #if defined(OS_CHROMEOS)
-  // Open 'open file' dialog
-  EXPECT_TRUE(ProcessWithContext(
-      ui::Accelerator(ui::VKEY_O, ui::EF_CONTROL_DOWN)));
-
   // Open file manager
   EXPECT_TRUE(ProcessWithContext(
       ui::Accelerator(ui::VKEY_M, ui::EF_SHIFT_DOWN  | ui::EF_ALT_DOWN)));
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index 5e23d79..e770cc8 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -64,7 +64,6 @@ const AcceleratorData kAcceleratorData[] = {
   { false, ui::VKEY_F13, ui::EF_NONE, LOCK_RELEASED },
   { true, ui::VKEY_POWER, ui::EF_NONE, POWER_PRESSED },
   { false, ui::VKEY_POWER, ui::EF_NONE, POWER_RELEASED },
-  { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_DIALOG },
   { true, ui::VKEY_M, ui::EF_SHIFT_DOWN | ui::EF_ALT_DOWN,
     OPEN_FILE_MANAGER },
   { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
index d1e22a8..b4fd857 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/accelerators/accelerator_table.h
@@ -128,7 +128,6 @@ enum AcceleratorAction {
   DISABLE_GPU_WATCHDOG,
   LOCK_SCREEN,
   OPEN_CROSH,
-  OPEN_FILE_DIALOG,  // Open 'Open file' dialog.
   OPEN_FILE_MANAGER,
   SWITCH_TO_NEXT_USER,
 #endif
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index fd95202..4a4dbd9 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -87,7 +87,7 @@ void ShellDelegateImpl::ToggleMaximized() {
     window_state->ToggleMaximized();
 }
 
-void ShellDelegateImpl::OpenFileManager(bool as_dialog) {
+void ShellDelegateImpl::OpenFileManager() {
 }
 
 void ShellDelegateImpl::OpenCrosh() {
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h
index 7a4e5d6..4c215b2 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -37,7 +37,7 @@ class ShellDelegateImpl : public ash::ShellDelegate {
   virtual void NewWindow(bool incognito) OVERRIDE;
   virtual void ToggleFullscreen() OVERRIDE;
   virtual void ToggleMaximized() OVERRIDE;
-  virtual void OpenFileManager(bool as_dialog) OVERRIDE;
+  virtual void OpenFileManager() OVERRIDE;
   virtual void OpenCrosh() OVERRIDE;
   virtual void RestoreTab() OVERRIDE;
   virtual void ShowKeyboardOverlay() OVERRIDE;
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index deedce8..8a86af8 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -145,7 +145,7 @@ class ASH_EXPORT ShellDelegate {
   virtual void ToggleMaximized() = 0;
 
   // Invoked when an accelerator is used to open the file manager.
-  virtual void OpenFileManager(bool as_dialog) = 0;
+  virtual void OpenFileManager() = 0;
 
   // Invoked when the user opens Crosh.
   virtual void OpenCrosh() = 0;
diff --git a/ash/test/test_shell_delegate.cc b/ash/test/test_shell_delegate.cc
index 7423822..f22847a 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -77,7 +77,7 @@ void TestShellDelegate::ToggleMaximized() {
 void TestShellDelegate::ToggleFullscreen() {
 }
 
-void TestShellDelegate::OpenFileManager(bool as_dialog) {
+void TestShellDelegate::OpenFileManager() {
 }
 
 void TestShellDelegate::OpenCrosh() {
diff --git a/ash/test/test_shell_delegate.h b/ash/test/test_shell_delegate.h
index dc8875b..1b6bb9e 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -40,7 +40,7 @@ class TestShellDelegate : public ShellDelegate {
   virtual void NewWindow(bool incognito) OVERRIDE;
   virtual void ToggleFullscreen() OVERRIDE;
   virtual void ToggleMaximized() OVERRIDE;
-  virtual void OpenFileManager(bool as_dialog) OVERRIDE;
+  virtual void OpenFileManager() OVERRIDE;
   virtual void OpenCrosh() OVERRIDE;
   virtual void RestoreTab() OVERRIDE;
   virtual void ShowKeyboardOverlay() OVERRIDE;