ash/system/tray/system_tray.cc - Issue 14507003: Add tray warning for Locally managed users.

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 14507003: Add tray warning for Locally managed users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix win-aura compile error Created 7 years, 8 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/tray/system_tray.cc

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

index 198d847bab3d9c93856641088f61aa178d576cc5..ce3a81a807141e8c968283da773c538b0b77639f 100644

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

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

@@ -52,6 +52,7 @@

#if defined(OS_CHROMEOS)

#include "ash/system/chromeos/audio/tray_audio.h"

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

+#include "ash/system/chromeos/managed/tray_locally_managed_user.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"

@@ -142,6 +143,7 @@ void SystemTray::CreateItems(SystemTrayDelegate* delegate) {

#endif

#if defined(OS_CHROMEOS)

AddTrayItem(new internal::TrayEnterprise(this));

+ AddTrayItem(new internal::TrayLocallyManagedUser(this));

#endif

AddTrayItem(new internal::TrayIME(this));

tray_accessibility_ = new internal::TrayAccessibility(this);