ash/common/wm_shell.cc - Issue 2098023002: mash: Migrate remaining tray observers and notify functions.

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 2098023002: mash: Migrate remaining tray observers and notify functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Sync and rebase. Created 4 years, 6 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

Index: ash/common/wm_shell.cc

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

index 974c1dbe45d6a407d975be53eaabed574dccbf14..4aa534e580fcae74d6ff84b133f6cdcfbf9defcb 100644

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

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

@@ -7,7 +7,7 @@

#include "ash/common/focus_cycler.h"

#include "ash/common/shell_window_ids.h"

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

-#include "ash/common/system/tray/wm_system_tray_notifier.h"

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

#include "ash/common/wm/overview/window_selector_controller.h"

#include "ash/common/wm_window.h"

#include "base/logging.h"

@@ -29,7 +29,7 @@ WmShell* WmShell::Get() {

WmShell::WmShell()

: focus_cycler_(new FocusCycler),

- system_tray_notifier_(new WmSystemTrayNotifier),

+ system_tray_notifier_(new SystemTrayNotifier),

window_selector_controller_(new WindowSelectorController()) {}

WmShell::~WmShell() {}

« no previous file with comments | « ash/common/wm_shell.h ('k') | ash/root_window_controller.cc » ('j') | ash/shell.h » ('J')