ash/common/system/chromeos/supervised/tray_supervised_user.cc - Issue 2108403004: mash: Move several chromeos system tray items to //ash/common

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: ash/common/system/chromeos/supervised/tray_supervised_user.cc

Issue 2108403004: mash: Move several chromeos system tray items to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@audio

Patch Set: Rebase Created 4 years, 5 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 unified diff | Download patch

« no previous file with comments | « ash/common/system/chromeos/supervised/tray_supervised_user.h ('k') | ash/common/system/chromeos/supervised/tray_supervised_user_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "ash/system/chromeos/supervised/tray_supervised_user.h"	5 #include "ash/common/system/chromeos/supervised/tray_supervised_user.h"

6	6

7 #include <utility>	7 #include <utility>

8	8

9 #include "ash/common/login_status.h"	9 #include "ash/common/login_status.h"

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

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

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

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

14 #include "ash/common/wm_shell.h"	14 #include "ash/common/wm_shell.h"

15 #include "base/callback.h"	15 #include "base/callback.h"

(...skipping 108 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
124	124

125 // Not intended to be used for non-supervised users.	125 // Not intended to be used for non-supervised users.

126 CHECK(delegate->IsUserSupervised());	126 CHECK(delegate->IsUserSupervised());

127	127

128 if (delegate->IsUserChild())	128 if (delegate->IsUserChild())

129 return IDR_AURA_UBER_TRAY_CHILD_USER;	129 return IDR_AURA_UBER_TRAY_CHILD_USER;

130 return IDR_AURA_UBER_TRAY_SUPERVISED_USER;	130 return IDR_AURA_UBER_TRAY_SUPERVISED_USER;

131 }	131 }

132	132

133 } // namespace ash	133 } // namespace ash

OLD	NEW