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

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

Issue 2882933002: Add update available icon in system tray (Closed)
Patch Set: Delay RequestUpdateCheck until the aboutChromeOS page is loaded 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
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 23 matching lines...) Expand all
34 bool active_directory_managed() const { return active_directory_managed_; } 34 bool active_directory_managed() const { return active_directory_managed_; }
35 35
36 // Wrappers around the mojom::SystemTrayClient interface. 36 // Wrappers around the mojom::SystemTrayClient interface.
37 void ShowSettings(); 37 void ShowSettings();
38 void ShowBluetoothSettings(); 38 void ShowBluetoothSettings();
39 void ShowBluetoothPairingDialog(const std::string& address, 39 void ShowBluetoothPairingDialog(const std::string& address,
40 const base::string16& name_for_display, 40 const base::string16& name_for_display,
41 bool paired, 41 bool paired,
42 bool connected); 42 bool connected);
43 void ShowDateSettings(); 43 void ShowDateSettings();
44 void ShowAboutChromeOS();
44 void ShowSetTimeDialog(); 45 void ShowSetTimeDialog();
45 void ShowDisplaySettings(); 46 void ShowDisplaySettings();
46 void ShowPowerSettings(); 47 void ShowPowerSettings();
47 void ShowChromeSlow(); 48 void ShowChromeSlow();
48 void ShowIMESettings(); 49 void ShowIMESettings();
49 void ShowHelp(); 50 void ShowHelp();
50 void ShowAccessibilityHelp(); 51 void ShowAccessibilityHelp();
51 void ShowAccessibilitySettings(); 52 void ShowAccessibilitySettings();
52 void ShowPaletteHelp(); 53 void ShowPaletteHelp();
53 void ShowPaletteSettings(); 54 void ShowPaletteSettings();
54 void ShowPublicAccountInfo(); 55 void ShowPublicAccountInfo();
55 void ShowEnterpriseInfo(); 56 void ShowEnterpriseInfo();
56 void ShowNetworkConfigure(const std::string& network_id); 57 void ShowNetworkConfigure(const std::string& network_id);
57 void ShowNetworkCreate(const std::string& type); 58 void ShowNetworkCreate(const std::string& type);
58 void ShowThirdPartyVpnCreate(const std::string& extension_id); 59 void ShowThirdPartyVpnCreate(const std::string& extension_id);
59 void ShowNetworkSettings(const std::string& network_id); 60 void ShowNetworkSettings(const std::string& network_id);
60 void ShowProxySettings(); 61 void ShowProxySettings();
61 void SignOut(); 62 void SignOut();
62 void RequestRestartForUpdate(); 63 void RequestRestartForUpdate();
64 void RequestUpdateCheck();
63 65
64 // Binds the mojom::SystemTray interface to this object. 66 // Binds the mojom::SystemTray interface to this object.
65 void BindRequest(mojom::SystemTrayRequest request); 67 void BindRequest(mojom::SystemTrayRequest request);
66 68
67 // mojom::SystemTray overrides. Public for testing. 69 // mojom::SystemTray overrides. Public for testing.
68 void SetClient(mojom::SystemTrayClientPtr client) override; 70 void SetClient(mojom::SystemTrayClientPtr client) override;
69 void SetPrimaryTrayEnabled(bool enabled) override; 71 void SetPrimaryTrayEnabled(bool enabled) override;
70 void SetPrimaryTrayVisible(bool visible) override; 72 void SetPrimaryTrayVisible(bool visible) override;
71 void SetUse24HourClock(bool use_24_hour) override; 73 void SetUse24HourClock(bool use_24_hour) override;
72 void SetEnterpriseDomain(const std::string& enterprise_domain, 74 void SetEnterpriseDomain(const std::string& enterprise_domain,
73 bool active_directory_managed) override; 75 bool active_directory_managed) override;
74 void ShowUpdateIcon(mojom::UpdateSeverity severity, 76 void ShowUpdateIcon(mojom::UpdateSeverity severity,
75 bool factory_reset_required, 77 bool factory_reset_required,
76 mojom::UpdateType update_type) override; 78 mojom::UpdateType update_type) override;
79 void ShowUpdateOverCellularAvailableIcon() override;
77 80
78 private: 81 private:
79 // Client interface in chrome browser. May be null in tests. 82 // Client interface in chrome browser. May be null in tests.
80 mojom::SystemTrayClientPtr system_tray_client_; 83 mojom::SystemTrayClientPtr system_tray_client_;
81 84
82 // Bindings for the SystemTray interface. 85 // Bindings for the SystemTray interface.
83 mojo::BindingSet<mojom::SystemTray> bindings_; 86 mojo::BindingSet<mojom::SystemTray> bindings_;
84 87
85 // The type of clock hour display: 12 or 24 hour. 88 // The type of clock hour display: 12 or 24 hour.
86 base::HourClockType hour_clock_type_; 89 base::HourClockType hour_clock_type_;
87 90
88 // The domain name of the organization that manages the device. Empty if the 91 // The domain name of the organization that manages the device. Empty if the
89 // device is not enterprise enrolled or if it uses Active Directory. 92 // device is not enterprise enrolled or if it uses Active Directory.
90 std::string enterprise_domain_; 93 std::string enterprise_domain_;
91 94
92 // Whether this is an Active Directory managed enterprise device. 95 // Whether this is an Active Directory managed enterprise device.
93 bool active_directory_managed_ = false; 96 bool active_directory_managed_ = false;
94 97
95 DISALLOW_COPY_AND_ASSIGN(SystemTrayController); 98 DISALLOW_COPY_AND_ASSIGN(SystemTrayController);
96 }; 99 };
97 100
98 } // namspace ash 101 } // namspace ash
99 102
100 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_ 103 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_CONTROLLER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698