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

Unified Diff: ash/accelerators/accelerator_controller.cc

Issue 838253004: MacViews: Fix duplicate definition of ExtensionKeyBindingRegistry::SetShortcutHandlingSuspended (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@DragBookmarks2
Patch Set: Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ash/accelerators/focus_manager_factory.h » ('j') | ash/accelerators/focus_manager_factory.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/accelerators/accelerator_controller.cc
diff --git a/ash/accelerators/accelerator_controller.cc b/ash/accelerators/accelerator_controller.cc
index 84f565c63891943c066bc245dd8377122142994c..c9f0d30de9733c96b93959e906a7bed0843e3eb6 100644
--- a/ash/accelerators/accelerator_controller.cc
+++ b/ash/accelerators/accelerator_controller.cc
@@ -718,15 +718,15 @@ void AcceleratorController::UnregisterAll(ui::AcceleratorTarget* target) {
bool AcceleratorController::Process(const ui::Accelerator& accelerator) {
if (ime_control_delegate_) {
- return accelerator_manager_->Process(
+ return accelerator_manager_->ProcessAccelerator(
ime_control_delegate_->RemapAccelerator(accelerator));
}
- return accelerator_manager_->Process(accelerator);
+ return accelerator_manager_->ProcessAccelerator(accelerator);
}
bool AcceleratorController::IsRegistered(
const ui::Accelerator& accelerator) const {
- return accelerator_manager_->GetCurrentTarget(accelerator) != NULL;
+ return accelerator_manager_->GetTargetForAccelerator(accelerator) != NULL;
}
bool AcceleratorController::IsPreferred(
« no previous file with comments | « no previous file | ash/accelerators/focus_manager_factory.h » ('j') | ash/accelerators/focus_manager_factory.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698