ash/system/chromeos/supervised/tray_supervised_user.cc - Issue 2072013002: mash: Move tray settings and deps to common.

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/chromeos/supervised/tray_supervised_user.cc

Issue 2072013002: mash: Move tray settings and deps to common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Undo 'git cl format' and nullptr changes. 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:

Index: ash/system/chromeos/supervised/tray_supervised_user.cc

diff --git a/ash/system/chromeos/supervised/tray_supervised_user.cc b/ash/system/chromeos/supervised/tray_supervised_user.cc

index df6e92ba15ed9647e81c0a2f2bd9ee8f11931417..c694c7f5af5d211efd3a2281ed6c3178ec40af6e 100644

--- a/ash/system/chromeos/supervised/tray_supervised_user.cc

+++ b/ash/system/chromeos/supervised/tray_supervised_user.cc

@@ -6,11 +6,11 @@

#include <utility>

+#include "ash/common/system/system_notifier.h"

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

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

#include "ash/common/wm_shell.h"

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

-#include "ash/system/system_notifier.h"

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

#include "ash/system/user/login_status.h"

#include "base/callback.h"