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

Unified Diff: ash/mus/accelerators/accelerator_controller_registrar.cc

Issue 2539363005: Converts ash to use aura-mus (Closed)
Patch Set: merge Created 4 years 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
Index: ash/mus/accelerators/accelerator_controller_registrar.cc
diff --git a/ash/mus/accelerators/accelerator_controller_registrar.cc b/ash/mus/accelerators/accelerator_controller_registrar.cc
index 7c80269cfd08c33d9d99363e3e4f378a4a01277c..4abc772892dbe374cb064eef25cf4226364cc3ed 100644
--- a/ash/mus/accelerators/accelerator_controller_registrar.cc
+++ b/ash/mus/accelerators/accelerator_controller_registrar.cc
@@ -126,16 +126,13 @@ void AcceleratorControllerRegistrar::OnAcceleratorRegistered(
post_event_matcher->accelerator_phase =
ui::mojom::AcceleratorPhase::POST_TARGET;
- window_manager_->window_manager_client()->AddAccelerators(
- ui::CreateAcceleratorVector(
- ComputeAcceleratorId(id_namespace_, ids.pre_id),
- std::move(event_matcher)),
+ window_manager_->window_manager_client()->AddAccelerator(
+ ComputeAcceleratorId(id_namespace_, ids.pre_id), std::move(event_matcher),
base::Bind(OnAcceleratorAdded, accelerator));
- window_manager_->window_manager_client()->AddAccelerators(
- ui::CreateAcceleratorVector(
- ComputeAcceleratorId(id_namespace_, ids.post_id),
- std::move(post_event_matcher)),
+ window_manager_->window_manager_client()->AddAccelerator(
+ ComputeAcceleratorId(id_namespace_, ids.post_id),
+ std::move(post_event_matcher),
base::Bind(OnAcceleratorAdded, accelerator));
}

Powered by Google App Engine
This is Rietveld 408576698