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

Side by Side Diff: ash/system/tray/system_tray_controller.h

Issue 2816253002: Display "Restart to update Adobe Flash Player" for Flash updates. (Closed)
Patch Set: Fix nits from last review 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
« no previous file with comments | « ash/public/interfaces/update.mojom ('k') | ash/system/tray/system_tray_controller.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 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 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
7 7
8 #include "ash/ash_export.h" 8 #include "ash/ash_export.h"
9 #include "ash/public/interfaces/system_tray.mojom.h" 9 #include "ash/public/interfaces/system_tray.mojom.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 60
61 // Binds the mojom::SystemTray interface to this object. 61 // Binds the mojom::SystemTray interface to this object.
62 void BindRequest(mojom::SystemTrayRequest request); 62 void BindRequest(mojom::SystemTrayRequest request);
63 63
64 // mojom::SystemTray overrides. Public for testing. 64 // mojom::SystemTray overrides. Public for testing.
65 void SetClient(mojom::SystemTrayClientPtr client) override; 65 void SetClient(mojom::SystemTrayClientPtr client) override;
66 void SetPrimaryTrayEnabled(bool enabled) override; 66 void SetPrimaryTrayEnabled(bool enabled) override;
67 void SetPrimaryTrayVisible(bool visible) override; 67 void SetPrimaryTrayVisible(bool visible) override;
68 void SetUse24HourClock(bool use_24_hour) override; 68 void SetUse24HourClock(bool use_24_hour) override;
69 void ShowUpdateIcon(mojom::UpdateSeverity severity, 69 void ShowUpdateIcon(mojom::UpdateSeverity severity,
70 bool factory_reset_required) override; 70 bool factory_reset_required,
71 mojom::UpdateType update_type) override;
71 72
72 private: 73 private:
73 // Client interface in chrome browser. May be null in tests. 74 // Client interface in chrome browser. May be null in tests.
74 mojom::SystemTrayClientPtr system_tray_client_; 75 mojom::SystemTrayClientPtr system_tray_client_;
75 76
76 // Bindings for the SystemTray interface. 77 // Bindings for the SystemTray interface.
77 mojo::BindingSet<mojom::SystemTray> bindings_; 78 mojo::BindingSet<mojom::SystemTray> bindings_;
78 79
79 // The type of clock hour display: 12 or 24 hour. 80 // The type of clock hour display: 12 or 24 hour.
80 base::HourClockType hour_clock_type_; 81 base::HourClockType hour_clock_type_;
81 82
82 DISALLOW_COPY_AND_ASSIGN(SystemTrayController); 83 DISALLOW_COPY_AND_ASSIGN(SystemTrayController);
83 }; 84 };
84 85
85 } // namspace ash 86 } // namspace ash
86 87
87 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 88 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
OLDNEW
« no previous file with comments | « ash/public/interfaces/update.mojom ('k') | ash/system/tray/system_tray_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698