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

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

Issue 1601063002: Removes ImeController::UsingFrenchInputMethod and thus ImeControlDelegate::RemapAccelerator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/ime_control_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 6
7 #include "ash/accelerators/accelerator_table.h" 7 #include "ash/accelerators/accelerator_table.h"
8 #include "ash/accessibility_delegate.h" 8 #include "ash/accessibility_delegate.h"
9 #include "ash/ash_switches.h" 9 #include "ash/ash_switches.h"
10 #include "ash/display/display_manager.h" 10 #include "ash/display/display_manager.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 144
145 int handle_next_ime_count() const { 145 int handle_next_ime_count() const {
146 return handle_next_ime_count_; 146 return handle_next_ime_count_;
147 } 147 }
148 int handle_previous_ime_count() const { 148 int handle_previous_ime_count() const {
149 return handle_previous_ime_count_; 149 return handle_previous_ime_count_;
150 } 150 }
151 int handle_switch_ime_count() const { 151 int handle_switch_ime_count() const {
152 return handle_switch_ime_count_; 152 return handle_switch_ime_count_;
153 } 153 }
154 ui::Accelerator RemapAccelerator(
155 const ui::Accelerator& accelerator) override {
156 return ui::Accelerator(accelerator);
157 }
158 154
159 private: 155 private:
160 int handle_next_ime_count_; 156 int handle_next_ime_count_;
161 int handle_previous_ime_count_; 157 int handle_previous_ime_count_;
162 int handle_switch_ime_count_; 158 int handle_switch_ime_count_;
163 159
164 DISALLOW_COPY_AND_ASSIGN(DummyImeControlDelegate); 160 DISALLOW_COPY_AND_ASSIGN(DummyImeControlDelegate);
165 }; 161 };
166 162
167 class DummyKeyboardBrightnessControlDelegate 163 class DummyKeyboardBrightnessControlDelegate
(...skipping 1410 matching lines...) Expand 10 before | Expand all | Expand 10 after
1578 EXPECT_TRUE(IsMessageCenterEmpty()); 1574 EXPECT_TRUE(IsMessageCenterEmpty());
1579 1575
1580 // If the action is LOCK_SCREEN, we must reset the state by unlocking the 1576 // If the action is LOCK_SCREEN, we must reset the state by unlocking the
1581 // screen before we proceed testing the rest of accelerators. 1577 // screen before we proceed testing the rest of accelerators.
1582 ResetStateIfNeeded(); 1578 ResetStateIfNeeded();
1583 } 1579 }
1584 } 1580 }
1585 #endif // defined(OS_CHROMEOS) 1581 #endif // defined(OS_CHROMEOS)
1586 1582
1587 } // namespace ash 1583 } // namespace ash
OLDNEW
« no previous file with comments | « ash/accelerators/accelerator_controller.cc ('k') | ash/ime_control_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698