| 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/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 Loading... |
| 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 } |
| 145 | 147 |
| 146 int handle_volume_mute_count() const { | 148 int handle_volume_mute_count() const { |
| 147 return handle_volume_mute_count_; | 149 return handle_volume_mute_count_; |
| 148 } | 150 } |
| 149 int handle_volume_down_count() const { | 151 int handle_volume_down_count() const { |
| 150 return handle_volume_down_count_; | 152 return handle_volume_down_count_; |
| 151 } | 153 } |
| 152 int handle_volume_up_count() const { | 154 int handle_volume_up_count() const { |
| 153 return handle_volume_up_count_; | 155 return handle_volume_up_count_; |
| 154 } | 156 } |
| (...skipping 576 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 EXPECT_FALSE(GetController()->Process(shift_alt_press)); | 733 EXPECT_FALSE(GetController()->Process(shift_alt_press)); |
| 732 EXPECT_FALSE(GetController()->Process(shift_alt_x_press)); | 734 EXPECT_FALSE(GetController()->Process(shift_alt_x_press)); |
| 733 EXPECT_FALSE(GetController()->Process(shift_alt_x)); | 735 EXPECT_FALSE(GetController()->Process(shift_alt_x)); |
| 734 EXPECT_FALSE(GetController()->Process(shift_alt)); | 736 EXPECT_FALSE(GetController()->Process(shift_alt)); |
| 735 EXPECT_EQ(2, delegate->handle_next_ime_count()); | 737 EXPECT_EQ(2, delegate->handle_next_ime_count()); |
| 736 } | 738 } |
| 737 } | 739 } |
| 738 | 740 |
| 739 } // namespace test | 741 } // namespace test |
| 740 } // namespace ash | 742 } // namespace ash |
| OLD | NEW |