summaryrefslogtreecommitdiffstats
path: root/ash/accelerators/accelerator_controller_unittest.cc
diff options
context:
space:
mode:
authorkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-01 00:46:09 +0000
committerkinaba@chromium.org <kinaba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-01 00:46:09 +0000
commit72a98fe4dfd555a5125e9774fc34aaa16a11dbc9 (patch)
tree74452d878b60c4b8c6a01105e7489eba2653d7c2 /ash/accelerators/accelerator_controller_unittest.cc
parent2bcb853b7272a030f0b6d9c5088f34c6802858b4 (diff)
downloadchromium_src-72a98fe4dfd555a5125e9774fc34aaa16a11dbc9.zip
chromium_src-72a98fe4dfd555a5125e9774fc34aaa16a11dbc9.tar.gz
chromium_src-72a98fe4dfd555a5125e9774fc34aaa16a11dbc9.tar.bz2
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
Diffstat (limited to 'ash/accelerators/accelerator_controller_unittest.cc')
-rw-r--r--ash/accelerators/accelerator_controller_unittest.cc4
1 files changed, 0 insertions, 4 deletions
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)));