ash/system/tray/system_tray.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/system/tray/system_tray.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/system/tray/system_tray.cc

diff --git a/ash/system/tray/system_tray.cc b/ash/system/tray/system_tray.cc

index 65cc28abcde4064c90f56ddff3318e27d470394c..c584effbef713623c1d4860810130699ca58b201 100644

--- a/ash/system/tray/system_tray.cc

+++ b/ash/system/tray/system_tray.cc

@@ -55,6 +55,7 @@

#include "ash/system/chromeos/bluetooth/tray_bluetooth.h"

#include "ash/system/chromeos/brightness/tray_brightness.h"

#include "ash/system/chromeos/enterprise/tray_enterprise.h"

+#include "ash/system/chromeos/media_security/multi_profile_media_tray_item.h"

#include "ash/system/chromeos/network/tray_network.h"

#include "ash/system/chromeos/network/tray_sms.h"

#include "ash/system/chromeos/network/tray_vpn.h"

@@ -65,7 +66,6 @@

#include "ash/system/chromeos/supervised/tray_supervised_user.h"

#include "ash/system/chromeos/tray_caps_lock.h"

#include "ash/system/chromeos/tray_display.h"

-#include "ash/system/tray/media_security/multi_profile_media_tray_item.h"

#include "ui/message_center/message_center.h"

#endif

« ash/shell.h ('K') | « ash/system/tray/media_security/multi_profile_media_tray_item_unittest.cc ('k') | ash/system/tray/system_tray_notifier.h » ('j') | no next file with comments »