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

Unified Diff: ash/mus/wm/main.cc

Issue 1641003002: [exp] ash: Ash in Mus. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: tot-merge 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 | « ash/mus/wm/accelerator_registrar_impl.cc ('k') | ash/mus/wm/non_client_frame_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/wm/main.cc
diff --git a/mash/screenlock/main.cc b/ash/mus/wm/main.cc
similarity index 73%
copy from mash/screenlock/main.cc
copy to ash/mus/wm/main.cc
index 23b307da6f9d11d2617b46ae422f17cab72d1bc0..391c58b65e60fb221fba69601e15d30f8ead198e 100644
--- a/mash/screenlock/main.cc
+++ b/ash/mus/wm/main.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "mash/screenlock/screenlock.h"
+#include "ash/mus/wm/window_manager_application.h"
#include "mojo/public/c/system/main.h"
#include "mojo/shell/public/cpp/application_runner.h"
MojoResult MojoMain(MojoHandle shell_handle) {
- mojo::ApplicationRunner runner(new mash::screenlock::Screenlock);
+ mojo::ApplicationRunner runner(new ash::muswm::WindowManagerApplication);
return runner.Run(shell_handle);
}
« no previous file with comments | « ash/mus/wm/accelerator_registrar_impl.cc ('k') | ash/mus/wm/non_client_frame_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698