ash/mus/bridge/wm_shell_mus.cc - Issue 2381753002: Use mojo SystemTray interfaces for both mash and classic ash

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/mus/bridge/wm_shell_mus.cc

Issue 2381753002: Use mojo SystemTray interfaces for both mash and classic ash (Closed)

Patch Set: Restructure based on feedback Created 4 years, 3 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:

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());