| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ash/accelerators/accelerator_controller.h" | 5 #include "ash/accelerators/accelerator_controller.h" |
| 6 #include "ash/accelerators/accelerator_table.h" | 6 #include "ash/accelerators/accelerator_table.h" |
| 7 #include "ash/caps_lock_delegate.h" | 7 #include "ash/caps_lock_delegate.h" |
| 8 #include "ash/display/display_manager.h" | 8 #include "ash/display/display_manager.h" |
| 9 #include "ash/ime_control_delegate.h" | 9 #include "ash/ime_control_delegate.h" |
| 10 #include "ash/screenshot_delegate.h" | 10 #include "ash/screenshot_delegate.h" |
| (...skipping 838 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 849 // ToggleDesktopBackgroundMode | 849 // ToggleDesktopBackgroundMode |
| 850 EXPECT_TRUE(ProcessWithContext( | 850 EXPECT_TRUE(ProcessWithContext( |
| 851 ui::Accelerator(ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN))); | 851 ui::Accelerator(ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN))); |
| 852 #if !defined(OS_LINUX) | 852 #if !defined(OS_LINUX) |
| 853 // ToggleDesktopFullScreen (not implemented yet on Linux) | 853 // ToggleDesktopFullScreen (not implemented yet on Linux) |
| 854 EXPECT_TRUE(ProcessWithContext( | 854 EXPECT_TRUE(ProcessWithContext( |
| 855 ui::Accelerator(ui::VKEY_F11, ui::EF_CONTROL_DOWN))); | 855 ui::Accelerator(ui::VKEY_F11, ui::EF_CONTROL_DOWN))); |
| 856 #endif // OS_LINUX | 856 #endif // OS_LINUX |
| 857 #endif // !NDEBUG | 857 #endif // !NDEBUG |
| 858 | 858 |
| 859 #if !defined(OS_WIN) | |
| 860 // Exit | 859 // Exit |
| 861 EXPECT_TRUE(ProcessWithContext( | 860 EXPECT_TRUE(ProcessWithContext( |
| 862 ui::Accelerator(ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); | 861 ui::Accelerator(ui::VKEY_Q, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); |
| 863 #endif | |
| 864 | 862 |
| 865 // New tab | 863 // New tab |
| 866 EXPECT_TRUE(ProcessWithContext( | 864 EXPECT_TRUE(ProcessWithContext( |
| 867 ui::Accelerator(ui::VKEY_T, ui::EF_CONTROL_DOWN))); | 865 ui::Accelerator(ui::VKEY_T, ui::EF_CONTROL_DOWN))); |
| 868 | 866 |
| 869 // New incognito window | 867 // New incognito window |
| 870 EXPECT_TRUE(ProcessWithContext( | 868 EXPECT_TRUE(ProcessWithContext( |
| 871 ui::Accelerator(ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); | 869 ui::Accelerator(ui::VKEY_N, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN))); |
| 872 | 870 |
| 873 // New window | 871 // New window |
| (...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1242 EXPECT_EQ(volume_down, delegate->last_accelerator()); | 1240 EXPECT_EQ(volume_down, delegate->last_accelerator()); |
| 1243 EXPECT_EQ(0, delegate->handle_volume_up_count()); | 1241 EXPECT_EQ(0, delegate->handle_volume_up_count()); |
| 1244 EXPECT_TRUE(ProcessWithContext(volume_up)); | 1242 EXPECT_TRUE(ProcessWithContext(volume_up)); |
| 1245 EXPECT_EQ(1, delegate->handle_volume_up_count()); | 1243 EXPECT_EQ(1, delegate->handle_volume_up_count()); |
| 1246 EXPECT_EQ(volume_up, delegate->last_accelerator()); | 1244 EXPECT_EQ(volume_up, delegate->last_accelerator()); |
| 1247 } | 1245 } |
| 1248 } | 1246 } |
| 1249 #endif | 1247 #endif |
| 1250 | 1248 |
| 1251 } // namespace ash | 1249 } // namespace ash |
| OLD | NEW |