Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(393)

Side by Side Diff: ash/accelerators/accelerator_controller_unittest.cc

Issue 12746002: Re-implement overscan & Implement Display Rotation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_table.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 830 matching lines...) Expand 10 before | Expand all | Expand 10 after
841 EXPECT_EQ(1, delegate->handle_keyboard_brightness_down_count()); 841 EXPECT_EQ(1, delegate->handle_keyboard_brightness_down_count());
842 EXPECT_EQ(alt_brightness_down, delegate->last_accelerator()); 842 EXPECT_EQ(alt_brightness_down, delegate->last_accelerator());
843 EXPECT_EQ(0, delegate->handle_keyboard_brightness_up_count()); 843 EXPECT_EQ(0, delegate->handle_keyboard_brightness_up_count());
844 EXPECT_TRUE(ProcessWithContext(alt_brightness_up)); 844 EXPECT_TRUE(ProcessWithContext(alt_brightness_up));
845 EXPECT_EQ(1, delegate->handle_keyboard_brightness_up_count()); 845 EXPECT_EQ(1, delegate->handle_keyboard_brightness_up_count());
846 EXPECT_EQ(alt_brightness_up, delegate->last_accelerator()); 846 EXPECT_EQ(alt_brightness_up, delegate->last_accelerator());
847 } 847 }
848 #endif 848 #endif
849 849
850 #if !defined(NDEBUG) 850 #if !defined(NDEBUG)
851 // RotateScreen
852 EXPECT_TRUE(ProcessWithContext(
853 ui::Accelerator(ui::VKEY_HOME, ui::EF_CONTROL_DOWN)));
854 // ToggleDesktopBackgroundMode 851 // ToggleDesktopBackgroundMode
855 EXPECT_TRUE(ProcessWithContext( 852 EXPECT_TRUE(ProcessWithContext(
856 ui::Accelerator(ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN))); 853 ui::Accelerator(ui::VKEY_B, ui::EF_CONTROL_DOWN | ui::EF_ALT_DOWN)));
857 #if !defined(OS_LINUX) 854 #if !defined(OS_LINUX)
858 // ToggleDesktopFullScreen (not implemented yet on Linux) 855 // ToggleDesktopFullScreen (not implemented yet on Linux)
859 EXPECT_TRUE(ProcessWithContext( 856 EXPECT_TRUE(ProcessWithContext(
860 ui::Accelerator(ui::VKEY_F11, ui::EF_CONTROL_DOWN))); 857 ui::Accelerator(ui::VKEY_F11, ui::EF_CONTROL_DOWN)));
861 #endif // OS_LINUX 858 #endif // OS_LINUX
862 #endif // !NDEBUG 859 #endif // !NDEBUG
863 860
(...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after
1245 EXPECT_EQ(volume_down, delegate->last_accelerator()); 1242 EXPECT_EQ(volume_down, delegate->last_accelerator());
1246 EXPECT_EQ(0, delegate->handle_volume_up_count()); 1243 EXPECT_EQ(0, delegate->handle_volume_up_count());
1247 EXPECT_TRUE(ProcessWithContext(volume_up)); 1244 EXPECT_TRUE(ProcessWithContext(volume_up));
1248 EXPECT_EQ(1, delegate->handle_volume_up_count()); 1245 EXPECT_EQ(1, delegate->handle_volume_up_count());
1249 EXPECT_EQ(volume_up, delegate->last_accelerator()); 1246 EXPECT_EQ(volume_up, delegate->last_accelerator());
1250 } 1247 }
1251 } 1248 }
1252 #endif 1249 #endif
1253 1250
1254 } // namespace ash 1251 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/accelerators/accelerator_table.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698