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

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

Issue 2752593008: Move AcceleratorController from WmShell to Shell (Closed)
Patch Set: cleanup Created 3 years, 9 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
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 bf4acc72d7af35d0736f595941a99ef87a35b87c..f1cd5c0393192e31a8648c69bc20ec7308ac4c4a 100644
--- a/ash/mus/accelerators/accelerator_controller_registrar.cc
+++ b/ash/mus/accelerators/accelerator_controller_registrar.cc
@@ -70,7 +70,7 @@ ui::mojom::EventResult AcceleratorControllerRegistrar::OnAccelerator(
const Ids& ids = iter->second;
AcceleratorController* accelerator_controller =
- WmShell::Get()->accelerator_controller();
+ Shell::Get()->accelerator_controller();
const bool is_pre = GetAcceleratorLocalId(id) == ids.pre_id;
if (is_pre) {
// TODO(sky): this does not exactly match ash code. In particular ash code
@@ -93,7 +93,7 @@ ui::mojom::EventResult AcceleratorControllerRegistrar::OnAccelerator(
}
DCHECK_EQ(GetAcceleratorLocalId(id), ids.post_id);
// NOTE: for post return value doesn't really matter.
- return WmShell::Get()->accelerator_controller()->Process(accelerator)
+ return Shell::Get()->accelerator_controller()->Process(accelerator)
? ui::mojom::EventResult::HANDLED
: ui::mojom::EventResult::UNHANDLED;
}

Powered by Google App Engine
This is Rietveld 408576698