| 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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 242 } | 242 } |
| 243 int handle_previous_ime_count() const { | 243 int handle_previous_ime_count() const { |
| 244 return handle_previous_ime_count_; | 244 return handle_previous_ime_count_; |
| 245 } | 245 } |
| 246 int handle_switch_ime_count() const { | 246 int handle_switch_ime_count() const { |
| 247 return handle_switch_ime_count_; | 247 return handle_switch_ime_count_; |
| 248 } | 248 } |
| 249 const ui::Accelerator& last_accelerator() const { | 249 const ui::Accelerator& last_accelerator() const { |
| 250 return last_accelerator_; | 250 return last_accelerator_; |
| 251 } | 251 } |
| 252 ui::Accelerator RemapAccelerator( |
| 253 const ui::Accelerator& accelerator) { |
| 254 return ui::Accelerator(accelerator); |
| 255 } |
| 252 | 256 |
| 253 private: | 257 private: |
| 254 const bool consume_; | 258 const bool consume_; |
| 255 int handle_next_ime_count_; | 259 int handle_next_ime_count_; |
| 256 int handle_previous_ime_count_; | 260 int handle_previous_ime_count_; |
| 257 int handle_switch_ime_count_; | 261 int handle_switch_ime_count_; |
| 258 ui::Accelerator last_accelerator_; | 262 ui::Accelerator last_accelerator_; |
| 259 | 263 |
| 260 DISALLOW_COPY_AND_ASSIGN(DummyImeControlDelegate); | 264 DISALLOW_COPY_AND_ASSIGN(DummyImeControlDelegate); |
| 261 }; | 265 }; |
| (...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 745 EXPECT_FALSE(GetController()->Process(shift_alt_press)); | 749 EXPECT_FALSE(GetController()->Process(shift_alt_press)); |
| 746 EXPECT_FALSE(GetController()->Process(shift_alt_x_press)); | 750 EXPECT_FALSE(GetController()->Process(shift_alt_x_press)); |
| 747 EXPECT_FALSE(GetController()->Process(shift_alt_x)); | 751 EXPECT_FALSE(GetController()->Process(shift_alt_x)); |
| 748 EXPECT_FALSE(GetController()->Process(shift_alt)); | 752 EXPECT_FALSE(GetController()->Process(shift_alt)); |
| 749 EXPECT_EQ(2, delegate->handle_next_ime_count()); | 753 EXPECT_EQ(2, delegate->handle_next_ime_count()); |
| 750 } | 754 } |
| 751 } | 755 } |
| 752 | 756 |
| 753 } // namespace test | 757 } // namespace test |
| 754 } // namespace ash | 758 } // namespace ash |
| OLD | NEW |