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

Side by Side Diff: ash/system/update/tray_update.h

Issue 2816253002: Display "Restart to update Adobe Flash Player" for Flash updates. (Closed)
Patch Set: Fix broken test Created 3 years, 8 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef ASH_SYSTEM_UPDATE_TRAY_UPDATE_H_ 5 #ifndef ASH_SYSTEM_UPDATE_TRAY_UPDATE_H_
6 #define ASH_SYSTEM_UPDATE_TRAY_UPDATE_H_ 6 #define ASH_SYSTEM_UPDATE_TRAY_UPDATE_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/system/tray/tray_image_item.h" 9 #include "ash/system/tray/tray_image_item.h"
10 #include "base/macros.h" 10 #include "base/macros.h"
11 11
12 namespace views { 12 namespace views {
13 class View; 13 class View;
14 } 14 }
15 15
16 namespace ash { 16 namespace ash {
17 17
18 namespace mojom { 18 namespace mojom {
19 enum class UpdateSeverity; 19 enum class UpdateSeverity;
20 enum class UpdateType;
20 } 21 }
21 22
22 // The system update tray item. The tray icon stays visible once an update 23 // The system update tray item. The tray icon stays visible once an update
23 // notification is received. The icon only disappears after a reboot to apply 24 // notification is received. The icon only disappears after a reboot to apply
24 // the update. Exported for test. 25 // the update. Exported for test.
25 class ASH_EXPORT TrayUpdate : public TrayImageItem { 26 class ASH_EXPORT TrayUpdate : public TrayImageItem {
26 public: 27 public:
27 explicit TrayUpdate(SystemTray* system_tray); 28 explicit TrayUpdate(SystemTray* system_tray);
28 ~TrayUpdate() override; 29 ~TrayUpdate() override;
29 30
30 // Shows an icon in the system tray indicating that a software update is 31 // Shows an icon in the system tray indicating that a software update is
31 // available. Once shown the icon persists until reboot. |severity| and 32 // available. Once shown the icon persists until reboot. |severity| and
32 // |factory_reset_required| are used to set the icon, color, and tooltip. 33 // |factory_reset_required| are used to set the icon, color, and tooltip.
33 void ShowUpdateIcon(mojom::UpdateSeverity severity, 34 void ShowUpdateIcon(mojom::UpdateSeverity severity,
34 bool factory_reset_required); 35 bool factory_reset_required,
36 mojom::UpdateType update_type);
35 37
36 private: 38 private:
37 class UpdateView; 39 class UpdateView;
38 40
39 // Overridden from TrayImageItem. 41 // Overridden from TrayImageItem.
40 bool GetInitialVisibility() override; 42 bool GetInitialVisibility() override;
41 views::View* CreateDefaultView(LoginStatus status) override; 43 views::View* CreateDefaultView(LoginStatus status) override;
42 44
43 // If an external monitor is connected then the system tray may be created 45 // If an external monitor is connected then the system tray may be created
44 // after the update data is sent from chrome, so share the update info between 46 // after the update data is sent from chrome, so share the update info between
45 // all instances. 47 // all instances.
46 static bool update_required_; 48 static bool update_required_;
47 static mojom::UpdateSeverity severity_; 49 static mojom::UpdateSeverity severity_;
48 static bool factory_reset_required_; 50 static bool factory_reset_required_;
51 static mojom::UpdateType update_type_;
49 52
50 DISALLOW_COPY_AND_ASSIGN(TrayUpdate); 53 DISALLOW_COPY_AND_ASSIGN(TrayUpdate);
51 }; 54 };
52 55
53 } // namespace ash 56 } // namespace ash
54 57
55 #endif // ASH_SYSTEM_UPDATE_TRAY_UPDATE_H_ 58 #endif // ASH_SYSTEM_UPDATE_TRAY_UPDATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698