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

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

Issue 10412012: Revert 137968 - Adding four bezel gestures (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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.h ('k') | ash/test/test_launcher_delegate.h » ('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/caps_lock_delegate.h" 6 #include "ash/caps_lock_delegate.h"
7 #include "ash/ime_control_delegate.h" 7 #include "ash/ime_control_delegate.h"
8 #include "ash/screenshot_delegate.h" 8 #include "ash/screenshot_delegate.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) OVERRIDE { 135 virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) OVERRIDE {
136 ++handle_volume_down_count_; 136 ++handle_volume_down_count_;
137 last_accelerator_ = accelerator; 137 last_accelerator_ = accelerator;
138 return consume_; 138 return consume_;
139 } 139 }
140 virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) OVERRIDE { 140 virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) OVERRIDE {
141 ++handle_volume_up_count_; 141 ++handle_volume_up_count_;
142 last_accelerator_ = accelerator; 142 last_accelerator_ = accelerator;
143 return consume_; 143 return consume_;
144 } 144 }
145 virtual void SetVolumePercent(double percent) OVERRIDE {
146 }
147 145
148 int handle_volume_mute_count() const { 146 int handle_volume_mute_count() const {
149 return handle_volume_mute_count_; 147 return handle_volume_mute_count_;
150 } 148 }
151 int handle_volume_down_count() const { 149 int handle_volume_down_count() const {
152 return handle_volume_down_count_; 150 return handle_volume_down_count_;
153 } 151 }
154 int handle_volume_up_count() const { 152 int handle_volume_up_count() const {
155 return handle_volume_up_count_; 153 return handle_volume_up_count_;
156 } 154 }
(...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after
733 EXPECT_FALSE(GetController()->Process(shift_alt_press)); 731 EXPECT_FALSE(GetController()->Process(shift_alt_press));
734 EXPECT_FALSE(GetController()->Process(shift_alt_x_press)); 732 EXPECT_FALSE(GetController()->Process(shift_alt_x_press));
735 EXPECT_FALSE(GetController()->Process(shift_alt_x)); 733 EXPECT_FALSE(GetController()->Process(shift_alt_x));
736 EXPECT_FALSE(GetController()->Process(shift_alt)); 734 EXPECT_FALSE(GetController()->Process(shift_alt));
737 EXPECT_EQ(2, delegate->handle_next_ime_count()); 735 EXPECT_EQ(2, delegate->handle_next_ime_count());
738 } 736 }
739 } 737 }
740 738
741 } // namespace test 739 } // namespace test
742 } // namespace ash 740 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.h ('k') | ash/test/test_launcher_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698