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

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

Issue 10452042: Fixing french keyboard handling (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fixed unit test Created 8 years, 6 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 | « no previous file | ash/accelerators/accelerator_controller_unittest.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 6
7 #include "ash/accelerators/accelerator_table.h" 7 #include "ash/accelerators/accelerator_table.h"
8 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/caps_lock_delegate.h" 9 #include "ash/caps_lock_delegate.h"
10 #include "ash/desktop_background/desktop_background_controller.h" 10 #include "ash/desktop_background/desktop_background_controller.h"
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 void AcceleratorController::Unregister(const ui::Accelerator& accelerator, 235 void AcceleratorController::Unregister(const ui::Accelerator& accelerator,
236 ui::AcceleratorTarget* target) { 236 ui::AcceleratorTarget* target) {
237 accelerator_manager_->Unregister(accelerator, target); 237 accelerator_manager_->Unregister(accelerator, target);
238 } 238 }
239 239
240 void AcceleratorController::UnregisterAll(ui::AcceleratorTarget* target) { 240 void AcceleratorController::UnregisterAll(ui::AcceleratorTarget* target) {
241 accelerator_manager_->UnregisterAll(target); 241 accelerator_manager_->UnregisterAll(target);
242 } 242 }
243 243
244 bool AcceleratorController::Process(const ui::Accelerator& accelerator) { 244 bool AcceleratorController::Process(const ui::Accelerator& accelerator) {
245 if (ime_control_delegate_.get()) {
246 return accelerator_manager_->Process(
247 ime_control_delegate_->RemapAccelerator(accelerator));
248 }
245 return accelerator_manager_->Process(accelerator); 249 return accelerator_manager_->Process(accelerator);
246 } 250 }
247 251
248 bool AcceleratorController::IsRegistered( 252 bool AcceleratorController::IsRegistered(
249 const ui::Accelerator& accelerator) const { 253 const ui::Accelerator& accelerator) const {
250 return accelerator_manager_->GetCurrentTarget(accelerator) != NULL; 254 return accelerator_manager_->GetCurrentTarget(accelerator) != NULL;
251 } 255 }
252 256
253 void AcceleratorController::SetBrightnessControlDelegate( 257 void AcceleratorController::SetBrightnessControlDelegate(
254 scoped_ptr<BrightnessControlDelegate> brightness_control_delegate) { 258 scoped_ptr<BrightnessControlDelegate> brightness_control_delegate) {
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 // Then set this one as active. 538 // Then set this one as active.
535 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index); 539 Shell::GetInstance()->launcher()->ActivateLauncherItem(found_index);
536 } 540 }
537 } 541 }
538 542
539 bool AcceleratorController::CanHandleAccelerators() const { 543 bool AcceleratorController::CanHandleAccelerators() const {
540 return true; 544 return true;
541 } 545 }
542 546
543 } // namespace ash 547 } // namespace ash
OLDNEW
« no previous file with comments | « no previous file | ash/accelerators/accelerator_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698