ash/system/chromeos/enterprise/tray_enterprise.h - 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/chromeos/enterprise/tray_enterprise.h

Issue 14507003: Add tray warning for Locally managed users. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merge w/ToT, fix nits 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/chromeos/enterprise/tray_enterprise.h

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

index 050c0f055c1d38c5b688d54d9b18c8befb1adfb5..521ead5a01c45567bfebe1d451364cde900f8631 100644

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

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

@@ -16,7 +16,7 @@ class SystemTray;

namespace ash {

namespace internal {

-class EnterpriseDefaultView;

+class LabelTrayView;

class TrayEnterprise : public SystemTrayItem,

public ViewClickListener,

@@ -40,7 +40,7 @@ class TrayEnterprise : public SystemTrayItem,

virtual void OnViewClicked(views::View* sender) OVERRIDE;

private:

- EnterpriseDefaultView* default_view_;

+ LabelTrayView* default_view_;

Dmitry Polukhin 2013/04/30 11:04:41 It is not default_view_ anymore, please call it so

Denis Kuznetsov (DE-MUC) 2013/04/30 11:32:52 Done.

DISALLOW_COPY_AND_ASSIGN(TrayEnterprise);

};