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

Unified Diff: ash/mus/root_window_controller.cc

Issue 2092343002: Touch HUD app for mustash (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change window manager connection unittest to original Created 4 years, 5 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 | « ash/mus/container_ids.cc ('k') | ash/mus/touch_hud_layout.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/root_window_controller.cc
diff --git a/ash/mus/root_window_controller.cc b/ash/mus/root_window_controller.cc
index 3a3f0d17551dd066b1f005012b5c71e60fe2d8f4..6e5b0ac26dedb9d73d3bd8e7878a6ef63c30d15c 100644
--- a/ash/mus/root_window_controller.cc
+++ b/ash/mus/root_window_controller.cc
@@ -28,6 +28,7 @@
#include "ash/mus/screenlock_layout.h"
#include "ash/mus/shelf_layout_manager.h"
#include "ash/mus/status_layout_manager.h"
+#include "ash/mus/touch_hud_layout.h"
#include "ash/mus/window_manager.h"
#include "base/bind.h"
#include "base/command_line.h"
@@ -257,6 +258,11 @@ void RootWindowController::CreateLayoutManagers() {
GetWindowByShellWindowId(kShellWindowId_PanelContainer);
panel_container->SetLayoutManager(
base::WrapUnique(new PanelLayoutManager(panel_container)));
+
+ WmWindowMus* touch_hud_container =
+ GetWindowByShellWindowId(kShellWindowId_OverlayContainer);
+ layout_managers_[touch_hud_container->mus_window()].reset(
+ new TouchHudLayout(touch_hud_container->mus_window()));
}
} // namespace mus
« no previous file with comments | « ash/mus/container_ids.cc ('k') | ash/mus/touch_hud_layout.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698