ash/common/system/chromeos/supervised/tray_supervised_user_unittest.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_unittest.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.cc ('k') | ash/common/system/chromeos/tray_caps_lock.h » ('j') | no next file with comments »

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 "ash/common/login_status.h"	7 #include "ash/common/login_status.h"

8 #include "ash/test/ash_test_base.h"	8 #include "ash/test/ash_test_base.h"

9 #include "ash/test/test_system_tray_delegate.h"	9 #include "ash/test/test_system_tray_delegate.h"

10 #include "ui/message_center/message_center.h"	10 #include "ui/message_center/message_center.h"

11 #include "ui/message_center/notification.h"	11 #include "ui/message_center/notification.h"

12 #include "ui/message_center/notification_list.h"	12 #include "ui/message_center/notification_list.h"

13 #include "ui/message_center/notification_types.h"	13 #include "ui/message_center/notification_types.h"

14	14

15 using message_center::NotificationList;	15 using message_center::NotificationList;

(...skipping 59 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
75 TEST_F(TraySupervisedUserInitialTest, SupervisedUserNoCrash) {	75 TEST_F(TraySupervisedUserInitialTest, SupervisedUserNoCrash) {

76 // Initial login status is already SUPERVISED, which should create	76 // Initial login status is already SUPERVISED, which should create

77 // the notification and should not cause crashes.	77 // the notification and should not cause crashes.

78 message_center::Notification* notification = GetPopup();	78 message_center::Notification* notification = GetPopup();

79 ASSERT_NE(static_cast<message_center::Notification*>(NULL), notification);	79 ASSERT_NE(static_cast<message_center::Notification*>(NULL), notification);

80 EXPECT_EQ(static_cast<int>(message_center::SYSTEM_PRIORITY),	80 EXPECT_EQ(static_cast<int>(message_center::SYSTEM_PRIORITY),

81 notification->rich_notification_data().priority);	81 notification->rich_notification_data().priority);

82 }	82 }

83	83

84 } // namespace ash	84 } // namespace ash

OLD	NEW