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

Side by Side Diff: ash/system/network/tray_network_unittest.cc

Issue 2869053002: Merge NetworkListViewBase hierarchy and NetworkStateListDetailedView (Closed)
Patch Set: Created 3 years, 7 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/network/tray_network.cc ('k') | ash/system/network/tray_vpn.h » ('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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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/network/tray_network.h" 5 #include "ash/system/network/tray_network.h"
6 6
7 #include "ash/login_status.h" 7 #include "ash/login_status.h"
8 #include "ash/system/network/network_state_list_detailed_view.h" 8 #include "ash/system/network/network_list.h"
9 #include "ash/system/tray/system_tray.h" 9 #include "ash/system/tray/system_tray.h"
10 #include "ash/test/ash_test_base.h" 10 #include "ash/test/ash_test_base.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "chromeos/dbus/dbus_thread_manager.h" 12 #include "chromeos/dbus/dbus_thread_manager.h"
13 #include "chromeos/network/network_handler.h" 13 #include "chromeos/network/network_handler.h"
14 #include "components/prefs/testing_pref_service.h" 14 #include "components/prefs/testing_pref_service.h"
15 #include "ui/message_center/message_center.h" 15 #include "ui/message_center/message_center.h"
16 16
17 using message_center::MessageCenter; 17 using message_center::MessageCenter;
18 18
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 tray_network->RequestToggleWifi(); 83 tray_network->RequestToggleWifi();
84 84
85 // Notification was shown. 85 // Notification was shown.
86 EXPECT_EQ(1u, MessageCenter::Get()->NotificationCount()); 86 EXPECT_EQ(1u, MessageCenter::Get()->NotificationCount());
87 EXPECT_TRUE(MessageCenter::Get()->HasPopupNotifications()); 87 EXPECT_TRUE(MessageCenter::Get()->HasPopupNotifications());
88 EXPECT_TRUE(MessageCenter::Get()->FindVisibleNotificationById("wifi-toggle")); 88 EXPECT_TRUE(MessageCenter::Get()->FindVisibleNotificationById("wifi-toggle"));
89 } 89 }
90 90
91 } // namespace 91 } // namespace
92 } // namespace ash 92 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/network/tray_network.cc ('k') | ash/system/network/tray_vpn.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698