ash/system/chromeos/supervised/tray_supervised_user.cc - Issue 2108793002: mash: Convert system tray logout button to wm common types

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 2108793002: mash: Convert system tray logout button to wm common types (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: more review comments, fix mash_unittests 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/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 eccb8bdd81f9015e5e4faf5a352bd2c34e0347b0..2b8f44e533206012c7eb065c6e332ff21302bc6b 100644

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

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

@@ -8,10 +8,10 @@

#include "ash/common/login_status.h"

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

+#include "ash/common/system/tray/label_tray_view.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 "base/callback.h"

#include "base/logging.h"

#include "grit/ash_resources.h"

« no previous file with comments | « ash/system/chromeos/session/tray_session_length_limit_unittest.cc ('k') | ash/system/status_area_widget.cc » ('j') | no next file with comments »