ash/common/wm_shell.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/common/wm_shell.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:

Index: ash/common/wm_shell.cc

diff --git a/ash/common/wm_shell.cc b/ash/common/wm_shell.cc

index ff23fb22180d11e66848a40277edb767f96be958..dc9c495cb82de834c25feba6c91cf73669db83a7 100644

--- a/ash/common/wm_shell.cc

+++ b/ash/common/wm_shell.cc

@@ -23,6 +23,7 @@

#include "ash/common/system/brightness_control_delegate.h"

#include "ash/common/system/keyboard_brightness_control_delegate.h"

#include "ash/common/system/toast/toast_manager.h"

+#include "ash/common/system/tray/system_tray_controller.h"

#include "ash/common/system/tray/system_tray_delegate.h"

#include "ash/common/system/tray/system_tray_notifier.h"

#include "ash/common/wallpaper/wallpaper_controller.h"

@@ -204,6 +205,8 @@ WmShell::WmShell(std::unique_ptr<ShellDelegate> shell_delegate)

focus_cycler_(new FocusCycler),

immersive_context_(base::MakeUnique<ImmersiveContextAsh>()),

shelf_model_(new ShelfModel), // Must create before ShelfDelegate.

+ system_tray_controller_(

+ new SystemTrayController(delegate_->GetShellConnector())),

system_tray_notifier_(new SystemTrayNotifier),

wallpaper_delegate_(delegate_->CreateWallpaperDelegate()),

window_cycle_controller_(new WindowCycleController),

« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/mus/bridge/wm_shell_mus.h » ('j') | no next file with comments »