Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(152)

Side by Side Diff: ash/system/supervised/tray_supervised_user_unittest.cc

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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/system/supervised/tray_supervised_user.cc ('k') | ash/system/system_clock_observer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/supervised/tray_supervised_user.h" 5 #include "ash/system/supervised/tray_supervised_user.h"
6 6
7 #include "ash/login_status.h" 7 #include "ash/common/login_status.h"
8 #include "ash/test/ash_test.h" 8 #include "ash/test/ash_test.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;
16 16
17 namespace ash { 17 namespace ash {
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 TEST_F(TraySupervisedUserInitialTest, SupervisedUserNoCrash) { 67 TEST_F(TraySupervisedUserInitialTest, SupervisedUserNoCrash) {
68 // Initial login status is already SUPERVISED, which should create 68 // Initial login status is already SUPERVISED, which should create
69 // the notification and should not cause crashes. 69 // the notification and should not cause crashes.
70 message_center::Notification* notification = GetPopup(); 70 message_center::Notification* notification = GetPopup();
71 ASSERT_NE(static_cast<message_center::Notification*>(NULL), notification); 71 ASSERT_NE(static_cast<message_center::Notification*>(NULL), notification);
72 EXPECT_EQ(static_cast<int>(message_center::SYSTEM_PRIORITY), 72 EXPECT_EQ(static_cast<int>(message_center::SYSTEM_PRIORITY),
73 notification->rich_notification_data().priority); 73 notification->rich_notification_data().priority);
74 } 74 }
75 75
76 } // namespace ash 76 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/supervised/tray_supervised_user.cc ('k') | ash/system/system_clock_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698