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/bridge/wm_shell_mus.cc

Issue 2381753002: Use mojo SystemTray interfaces for both mash and classic ash (Closed)
Patch Set: rebase again Created 4 years, 2 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/bridge/wm_shell_mus.h ('k') | ash/mus/shell_delegate_mus.h » ('j') | no next file with comments »
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 cc81f8f454d5d62c293274a7d098dc7edca3d8a0..8c948a1aa5f9f31622b5f15e60b0f3eda41c099f 100644
--- a/ash/mus/bridge/wm_shell_mus.cc
+++ b/ash/mus/bridge/wm_shell_mus.cc
@@ -203,6 +203,10 @@ WmRootWindowControllerMus* WmShellMus::GetRootWindowControllerWithDisplayId(
return nullptr;
}
+bool WmShellMus::IsRunningInMash() const {
+ return true;
+}
+
WmWindow* WmShellMus::NewWindow(ui::wm::WindowType window_type,
ui::LayerType layer_type) {
WmWindowMus* window = WmWindowMus::Get(window_tree_client()->NewWindow());
« no previous file with comments | « ash/mus/bridge/wm_shell_mus.h ('k') | ash/mus/shell_delegate_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698