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

Unified Diff: ash/mus/window_manager_application.cc

Issue 2271373002: mash: Port mojo:ash_sysui's ContextMenuMus to mojo:ash. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments Created 4 years, 4 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/window_manager_application.h ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager_application.cc
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
index 412b4e3fa41aa50de6cb9992a568469ef0a90339..809a2e56966ad60b772e6cf298e7ad020a3c7880 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -8,6 +8,7 @@
#include "ash/common/material_design/material_design_controller.h"
#include "ash/mus/accelerators/accelerator_registrar_impl.h"
+#include "ash/mus/native_widget_factory_mus.h"
#include "ash/mus/window_manager.h"
#include "base/bind.h"
#include "base/memory/ptr_util.h"
@@ -110,6 +111,9 @@ void WindowManagerApplication::OnStart(const shell::Identity& identity) {
window_manager_.get(), window_manager_.get(), nullptr);
window_tree_client->ConnectAsWindowManager(connector());
+ native_widget_factory_mus_.reset(
+ new NativeWidgetFactoryMus(window_manager_.get()));
+
InitWindowManager(window_tree_client);
}
« no previous file with comments | « ash/mus/window_manager_application.h ('k') | ash/root_window_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698