Remove Ctrl+M for the Chrome OS Files app

BUG=152769


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

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

13 files changed, 17 insertions, 38 deletions

diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 70aa3ac..b55e0b6 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -102,8 +102,8 @@ bool HandleLock() {
   return true;
 }
 
-bool HandleFileManager(bool as_dialog) {
-  Shell::GetInstance()->delegate()->OpenFileManager(as_dialog);
+bool HandleFileManager() {
+  Shell::GetInstance()->delegate()->OpenFileManager();
   return true;
 }
 
@@ -484,9 +484,7 @@ bool AcceleratorController::PerformAction(int action,
     case LOCK_SCREEN:
       return HandleLock();
     case OPEN_FILE_MANAGER_DIALOG:
-      return HandleFileManager(true /* as_dialog */);
-    case OPEN_FILE_MANAGER_TAB:
-      return HandleFileManager(false /* as_dialog */);
+      return HandleFileManager();
     case OPEN_CROSH:
       return HandleCrosh();
     case SWAP_PRIMARY_DISPLAY:
diff --git a/ash/accelerators/accelerator_controller_unittest.cc b/ash/accelerators/accelerator_controller_unittest.cc
index e4f2b26..2111d8b 100644
--- a/ash/accelerators/accelerator_controller_unittest.cc
+++ b/ash/accelerators/accelerator_controller_unittest.cc
@@ -881,10 +881,6 @@ TEST_F(AcceleratorControllerTest, GlobalAccelerators) {
   EXPECT_TRUE(ProcessWithContext(
       ui::Accelerator(ui::VKEY_O, ui::EF_CONTROL_DOWN)));
 
-  // Open file manager tab
-  EXPECT_TRUE(ProcessWithContext(
-      ui::Accelerator(ui::VKEY_M, ui::EF_CONTROL_DOWN)));
-
   // Lock screen
   // NOTE: Accelerators that do not work on the lock screen need to be
   // tested before the sequence below is invoked because it causes a side
diff --git a/ash/accelerators/accelerator_table.cc b/ash/accelerators/accelerator_table.cc
index c84c409..7ee3cab 100644
--- a/ash/accelerators/accelerator_table.cc
+++ b/ash/accelerators/accelerator_table.cc
@@ -78,7 +78,6 @@ const AcceleratorData kAcceleratorData[] = {
   { false, ui::VKEY_POWER, ui::EF_SHIFT_DOWN, LOCK_RELEASED },
 #endif  // !defined(NDEBUG)
   { true, ui::VKEY_O, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_DIALOG },
-  { true, ui::VKEY_M, ui::EF_CONTROL_DOWN, OPEN_FILE_MANAGER_TAB },
   { true, ui::VKEY_T, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN, OPEN_CROSH },
   { true, ui::VKEY_G, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN,
     DISABLE_GPU_WATCHDOG },
diff --git a/ash/accelerators/accelerator_table.h b/ash/accelerators/accelerator_table.h
index 4747bdb..7270ba2 100644
--- a/ash/accelerators/accelerator_table.h
+++ b/ash/accelerators/accelerator_table.h
@@ -84,7 +84,6 @@ enum AcceleratorAction {
   LOCK_SCREEN,
   OPEN_CROSH,
   OPEN_FILE_MANAGER_DIALOG,
-  OPEN_FILE_MANAGER_TAB,
   DISABLE_GPU_WATCHDOG,
 #endif
 #if !defined(NDEBUG)
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc
index 1edc9d1..8cf97ba 100644
--- a/ash/shell/shell_delegate_impl.cc
+++ b/ash/shell/shell_delegate_impl.cc
@@ -90,7 +90,7 @@ void ShellDelegateImpl::ToggleMaximized() {
     ash::wm::ToggleMaximizedWindow(window);
 }
 
-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 3dd663e0a..6e0b7c0 100644
--- a/ash/shell/shell_delegate_impl.h
+++ b/ash/shell/shell_delegate_impl.h
@@ -33,7 +33,7 @@ class ShellDelegateImpl : public ash::ShellDelegate {
   virtual void NewTab() OVERRIDE;
   virtual void NewWindow(bool incognito) OVERRIDE;
   virtual void ToggleMaximized() OVERRIDE;
-  virtual void OpenFileManager(bool as_dialog) OVERRIDE;
+  virtual void OpenFileManager() OVERRIDE;
   virtual void OpenCrosh() OVERRIDE;
   virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;
   virtual void RestoreTab() OVERRIDE;
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index a7eb838..26b54a1 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -105,8 +105,8 @@ class ASH_EXPORT ShellDelegate {
   // Invoked when the user uses F4 to toggle window maximized state.
   virtual void ToggleMaximized() = 0;
 
-  // Invoked when the user uses Ctrl-M or Ctrl-O to open file manager.
-  virtual void OpenFileManager(bool as_dialog) = 0;
+  // Invoked when the user uses Ctrl-O to open file manager.
+  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 4af4eb3..066a14b 100644
--- a/ash/test/test_shell_delegate.cc
+++ b/ash/test/test_shell_delegate.cc
@@ -80,7 +80,7 @@ void TestShellDelegate::ToggleMaximized() {
     ash::wm::ToggleMaximizedWindow(window);
 }
 
-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 36fe97b..c35d116 100644
--- a/ash/test/test_shell_delegate.h
+++ b/ash/test/test_shell_delegate.h
@@ -32,7 +32,7 @@ class TestShellDelegate : public ShellDelegate {
   virtual void NewTab() OVERRIDE;
   virtual void NewWindow(bool incognito) OVERRIDE;
   virtual void ToggleMaximized() OVERRIDE;
-  virtual void OpenFileManager(bool as_dialog) OVERRIDE;
+  virtual void OpenFileManager() OVERRIDE;
   virtual void OpenCrosh() OVERRIDE;
   virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;
   virtual void RestoreTab() OVERRIDE;
diff --git a/chrome/browser/chromeos/extensions/file_manager_util.cc b/chrome/browser/chromeos/extensions/file_manager_util.cc
index 814bffa..149140e 100644
--- a/chrome/browser/chromeos/extensions/file_manager_util.cc
+++ b/chrome/browser/chromeos/extensions/file_manager_util.cc
@@ -597,10 +597,6 @@ void ViewFolder(const FilePath& path) {
   OpenFileBrowser(path, REUSE_SAME_PATH, "open");
 }
 
-void OpenApplication() {
-  OpenFileBrowser(FilePath(), REUSE_NEVER, "");
-}
-
 bool ExecuteDefaultHandler(Profile* profile, const FilePath& path) {
   GURL url;
   if (!ConvertFileToFileSystemUrl(profile, path,
diff --git a/chrome/browser/chromeos/extensions/file_manager_util.h b/chrome/browser/chromeos/extensions/file_manager_util.h
index d0b5813..d71a709 100644
--- a/chrome/browser/chromeos/extensions/file_manager_util.h
+++ b/chrome/browser/chromeos/extensions/file_manager_util.h
@@ -78,9 +78,6 @@ void ViewFile(const FilePath& path);
 // Opens file browser on the folder containing the file, with the file selected.
 void ShowFileInFolder(const FilePath& path);
 
-// Opens file browser application.
-void OpenApplication();
-
 // Executes the built-in File Manager handler or tries to open |file| directly
 // in the browser. Returns false if neither is possible.
 bool ExecuteBuiltinHandler(
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index e717d1d..050e1ca 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -49,7 +49,6 @@
 #include "base/chromeos/chromeos_version.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/background/ash_user_wallpaper_delegate.h"
-#include "chrome/browser/chromeos/extensions/file_manager_util.h"
 #include "chrome/browser/chromeos/extensions/media_player_event_router.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ -207,19 +206,14 @@ void ChromeShellDelegate::ToggleMaximized() {
   ash::wm::ToggleMaximizedWindow(window);
 }
 
-void ChromeShellDelegate::OpenFileManager(bool as_dialog) {
+void ChromeShellDelegate::OpenFileManager() {
 #if defined(OS_CHROMEOS)
-  if (as_dialog) {
-    Browser* browser =
-        chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
-    // Open the select file dialog only if there is an active browser where the
-    // selected file is displayed.
-    if (browser) {
-      browser->OpenFile();
-      return;
-    }
-  } else {
-    file_manager_util::OpenApplication();
+  Browser* browser =
+      chrome::FindBrowserWithWindow(ash::wm::GetActiveWindow());
+  // Open the select file dialog only if there is an active browser where the
+  // selected file is displayed.
+  if (browser) {
+    browser->OpenFile();
   }
 #endif
 }
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h
index 568009f..b7dad20 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.h
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
@@ -48,7 +48,7 @@ class ChromeShellDelegate : public ash::ShellDelegate,
   virtual void NewTab() OVERRIDE;
   virtual void NewWindow(bool is_incognito) OVERRIDE;
   virtual void ToggleMaximized() OVERRIDE;
-  virtual void OpenFileManager(bool as_dialog) OVERRIDE;
+  virtual void OpenFileManager() OVERRIDE;
   virtual void OpenCrosh() OVERRIDE;
   virtual void OpenMobileSetup(const std::string& service_path) OVERRIDE;
   virtual void RestoreTab() OVERRIDE;