diff options
| author | kaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 18:32:44 +0000 |
|---|---|---|
| committer | kaznacheev@chromium.org <kaznacheev@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-11 18:32:44 +0000 |
| commit | a5fdb93ec2f6dc1b33d79bb3396c0cdb35f519f6 (patch) | |
| tree | c1f5ac671eee74378c701406d4800864a8a3d69d /ash/accelerators | |
| parent | 7c0a01ad2b00207514ab5b0a2573a037241f685c (diff) | |
| download | chromium_src-a5fdb93ec2f6dc1b33d79bb3396c0cdb35f519f6.zip chromium_src-a5fdb93ec2f6dc1b33d79bb3396c0cdb35f519f6.tar.gz chromium_src-a5fdb93ec2f6dc1b33d79bb3396c0cdb35f519f6.tar.bz2 | |
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
Diffstat (limited to 'ash/accelerators')
| -rw-r--r-- | ash/accelerators/accelerator_controller.cc | 8 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_controller_unittest.cc | 4 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_table.cc | 1 | ||||
| -rw-r--r-- | ash/accelerators/accelerator_table.h | 1 |
4 files changed, 3 insertions, 11 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) |