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

Unified Diff: mash/wm/window_manager_application.cc

Issue 1637113003: Add simplistic screenlock application. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 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
« no previous file with comments | « mash/wm/window_manager_application.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/wm/window_manager_application.cc
diff --git a/mash/wm/window_manager_application.cc b/mash/wm/window_manager_application.cc
index 88e7163d7f5d60109082702af970150d480c0f01..eb3dfa606ad6d3bdf9e90f8fba68072537e6d7bb 100644
--- a/mash/wm/window_manager_application.cc
+++ b/mash/wm/window_manager_application.cc
@@ -15,6 +15,7 @@
#include "components/mus/public/cpp/window_tree_host_factory.h"
#include "mash/wm/accelerator_registrar_impl.h"
#include "mash/wm/background_layout.h"
+#include "mash/wm/screenlock_layout.h"
#include "mash/wm/shadow_controller.h"
#include "mash/wm/shelf_layout.h"
#include "mash/wm/user_window_controller_impl.h"
@@ -119,8 +120,10 @@ void WindowManagerApplication::OnEmbed(mus::Window* root) {
CreateContainers();
background_layout_.reset(new BackgroundLayout(
GetWindowForContainer(mojom::Container::USER_BACKGROUND)));
- shelf_layout_.reset(
- new ShelfLayout(GetWindowForContainer(mojom::Container::USER_SHELF)));
+ screenlock_layout_.reset(new ScreenlockLayout(GetWindowForContainer(
+ mojom::Container::LOGIN_WINDOWS)));
+ shelf_layout_.reset(new ShelfLayout(GetWindowForContainer(
+ mojom::Container::USER_SHELF)));
mus::Window* window = GetWindowForContainer(mojom::Container::USER_WINDOWS);
window_layout_.reset(
« no previous file with comments | « mash/wm/window_manager_application.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698