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

Unified Diff: ui/wm/core/nested_accelerator_controller_unittest.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
« ui/views/focus/focus_manager.cc ('K') | « ui/views/views.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/nested_accelerator_controller_unittest.cc
diff --git a/ui/wm/core/nested_accelerator_controller_unittest.cc b/ui/wm/core/nested_accelerator_controller_unittest.cc
index 4e55d4f5f26a10d3cd992aab3273672ce81081b8..0a079832c8da1e54e541e7ceabb7c61e07775460 100644
--- a/ui/wm/core/nested_accelerator_controller_unittest.cc
+++ b/ui/wm/core/nested_accelerator_controller_unittest.cc
@@ -105,8 +105,9 @@ class MockNestedAcceleratorDelegate : public NestedAcceleratorDelegate {
// NestedAcceleratorDelegate:
Result ProcessAccelerator(const ui::Accelerator& accelerator) override {
- return accelerator_manager_->Process(accelerator) ?
- RESULT_PROCESSED : RESULT_NOT_PROCESSED;
+ return accelerator_manager_->ProcessAccelerator(accelerator)
+ ? RESULT_PROCESSED
+ : RESULT_NOT_PROCESSED;
}
void Register(const ui::Accelerator& accelerator,
« ui/views/focus/focus_manager.cc ('K') | « ui/views/views.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698