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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2296763009: mash: Fix launching touch hud app in mash mode. (Closed)
Patch Set: Created 4 years, 3 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
« ash/mus/accelerators/accelerator_controller_delegate_mus.cc ('K') | « ash/mus/accelerators/accelerator_controller_delegate_mus.cc ('k') | ash/mus/manifest.json » ('j') | ash/touch_hud/mus/touch_hud_application.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.cc
diff --git a/ash/mus/bridge/wm_shell_mus.cc b/ash/mus/bridge/wm_shell_mus.cc
index 58ca302cbdb1e336f84a93e05e19434a3570e6b2..78959a48aad559e9114e08841a787df655b60d2d 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -122,7 +122,8 @@ WmShellMus::WmShellMus(
window_manager->GetNextAcceleratorNamespaceId(&accelerator_namespace_id);
// WmShellMus is created early on, so that this should always succeed.
DCHECK(add_result);
- accelerator_controller_delegate_.reset(new AcceleratorControllerDelegateMus);
+ accelerator_controller_delegate_.reset(
+ new AcceleratorControllerDelegateMus(window_manager_->connector()));
accelerator_controller_registrar_.reset(new AcceleratorControllerRegistrar(
window_manager_, accelerator_namespace_id));
SetAcceleratorController(base::MakeUnique<AcceleratorController>(
« ash/mus/accelerators/accelerator_controller_delegate_mus.cc ('K') | « ash/mus/accelerators/accelerator_controller_delegate_mus.cc ('k') | ash/mus/manifest.json » ('j') | ash/touch_hud/mus/touch_hud_application.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698