ash/system/chromeos/enterprise/tray_enterprise.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/enterprise/tray_enterprise.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: ifdefs 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/enterprise/tray_enterprise.cc

diff --git a/ash/system/chromeos/enterprise/tray_enterprise.cc b/ash/system/chromeos/enterprise/tray_enterprise.cc

index ac7e35e59ce60bd74f74b32af4f5de80b0c9a694..15738662dc442442de78766eb0a867f0668cc537 100644

--- a/ash/system/chromeos/enterprise/tray_enterprise.cc

+++ b/ash/system/chromeos/enterprise/tray_enterprise.cc

@@ -5,10 +5,10 @@

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

#include "ash/common/login_status.h"

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

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

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

#include "ash/common/wm_shell.h"

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

#include "base/logging.h"

#include "base/strings/string16.h"

#include "grit/ash_resources.h"

« ash/shell.cc ('K') | « ash/shell.cc ('k') | ash/system/chromeos/label_tray_view.h » ('j') | no next file with comments »