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

Side by Side Diff: ash/common/system/update/tray_update_unittest.cc

Issue 2558043006: ash: Use system tray mojo interface to show system update tray icon (Closed)
Patch Set: fix gcc Created 4 years 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/update/tray_update.cc ('k') | ash/common/system/update/update_observer.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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/common/system/update/tray_update.h" 5 #include "ash/common/system/update/tray_update.h"
6 6
7 #include "ash/common/system/tray/system_tray.h" 7 #include "ash/common/system/tray/system_tray.h"
8 #include "ash/common/system/tray/system_tray_delegate.h" 8 #include "ash/common/system/tray/system_tray_controller.h"
9 #include "ash/common/system/tray/system_tray_notifier.h"
10 #include "ash/common/test/ash_test.h" 9 #include "ash/common/test/ash_test.h"
11 #include "ash/common/wm_shell.h" 10 #include "ash/common/wm_shell.h"
11 #include "ash/public/interfaces/update.mojom.h"
12 12
13 namespace ash { 13 namespace ash {
14 14
15 using TrayUpdateTest = AshTest; 15 using TrayUpdateTest = AshTest;
16 16
17 // Tests that the update icon becomes visible when an update becomes 17 // Tests that the update icon becomes visible when an update becomes
18 // available. 18 // available.
19 TEST_F(TrayUpdateTest, VisibilityAfterUpdate) { 19 TEST_F(TrayUpdateTest, VisibilityAfterUpdate) {
20 TrayUpdate* tray_update = GetPrimarySystemTray()->GetTrayUpdateForTesting(); 20 TrayUpdate* tray_update = GetPrimarySystemTray()->tray_update();
21 21
22 // The system starts with no update pending. 22 // The system starts with no update pending, so the icon isn't visible.
23 UpdateInfo initial_info;
24 WmShell::Get()->system_tray_delegate()->GetSystemUpdateInfo(&initial_info);
25 EXPECT_FALSE(initial_info.update_required);
26
27 // When no update is pending, the item isn't visible.
28 EXPECT_FALSE(tray_update->tray_view()->visible()); 23 EXPECT_FALSE(tray_update->tray_view()->visible());
29 24
30 // Simulate an update. 25 // Simulate an update.
31 UpdateInfo info; 26 WmShell::Get()->system_tray_controller()->ShowUpdateIcon(
32 info.update_required = true; 27 mojom::UpdateSeverity::LOW, false);
33 WmShell::Get()->system_tray_notifier()->NotifyUpdateRecommended(info);
34 28
35 // Tray item is now visible. 29 // Tray item is now visible.
36 EXPECT_TRUE(tray_update->tray_view()->visible()); 30 EXPECT_TRUE(tray_update->tray_view()->visible());
37 } 31 }
38 32
39 } // namespace ash 33 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/update/tray_update.cc ('k') | ash/common/system/update/update_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698