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

Side by Side Diff: ash/common/system/tray/system_tray_delegate.h

Issue 2522613004: Revert of chromeos: Convert ash VPNDelegate interface to mojo (Closed)
Patch Set: Created 4 years, 1 month 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_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 UpdateInfo(); 66 UpdateInfo();
67 ~UpdateInfo(); 67 ~UpdateInfo();
68 68
69 UpdateSeverity severity; 69 UpdateSeverity severity;
70 bool update_required; 70 bool update_required;
71 bool factory_reset_required; 71 bool factory_reset_required;
72 }; 72 };
73 73
74 class CastConfigDelegate; 74 class CastConfigDelegate;
75 class NetworkingConfigDelegate; 75 class NetworkingConfigDelegate;
76 class VPNDelegate;
76 77
77 // SystemTrayDelegate is intended for delegating tasks in the System Tray to the 78 // SystemTrayDelegate is intended for delegating tasks in the System Tray to the
78 // application (e.g. Chrome). These tasks should be limited to application 79 // application (e.g. Chrome). These tasks should be limited to application
79 // (browser) specific tasks. For non application specific tasks, where possible, 80 // (browser) specific tasks. For non application specific tasks, where possible,
80 // components/, chromeos/, device/, etc., code should be used directly. If more 81 // components/, chromeos/, device/, etc., code should be used directly. If more
81 // than one related method is being added, consider adding an additional 82 // than one related method is being added, consider adding an additional
82 // specific delegate (e.g. CastConfigDelegate). 83 // specific delegate (e.g. VPNDelegate).
83 // 84 //
84 // These methods should all have trivial default implementations for platforms 85 // These methods should all have trivial default implementations for platforms
85 // that do not implement the method (e.g. return false or nullptr). This 86 // that do not implement the method (e.g. return false or nullptr). This
86 // eliminates the need to propagate default implementations across the various 87 // eliminates the need to propagate default implementations across the various
87 // implementations of this class. Consumers of this delegate should handle the 88 // implementations of this class. Consumers of this delegate should handle the
88 // default return value (e.g. nullptr). 89 // default return value (e.g. nullptr).
89 class ASH_EXPORT SystemTrayDelegate { 90 class ASH_EXPORT SystemTrayDelegate {
90 public: 91 public:
91 SystemTrayDelegate(); 92 SystemTrayDelegate();
92 virtual ~SystemTrayDelegate(); 93 virtual ~SystemTrayDelegate();
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 // Returns true when the Search key is configured to be treated as Caps Lock. 212 // Returns true when the Search key is configured to be treated as Caps Lock.
212 virtual bool IsSearchKeyMappedToCapsLock(); 213 virtual bool IsSearchKeyMappedToCapsLock();
213 214
214 // Adding observers that are notified when supervised info is being changed. 215 // Adding observers that are notified when supervised info is being changed.
215 virtual void AddCustodianInfoTrayObserver( 216 virtual void AddCustodianInfoTrayObserver(
216 CustodianInfoTrayObserver* observer); 217 CustodianInfoTrayObserver* observer);
217 218
218 virtual void RemoveCustodianInfoTrayObserver( 219 virtual void RemoveCustodianInfoTrayObserver(
219 CustodianInfoTrayObserver* observer); 220 CustodianInfoTrayObserver* observer);
220 221
222 // Returns VPNDelegate. May return nullptr.
223 virtual VPNDelegate* GetVPNDelegate() const;
224
221 // Creates a system tray item for display rotation lock. 225 // Creates a system tray item for display rotation lock.
222 // TODO(jamescook): Remove this when mus has support for display management 226 // TODO(jamescook): Remove this when mus has support for display management
223 // and we have a DisplayManager equivalent. See http://crbug.com/548429 227 // and we have a DisplayManager equivalent. See http://crbug.com/548429
224 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( 228 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem(
225 SystemTray* tray); 229 SystemTray* tray);
226 }; 230 };
227 231
228 } // namespace ash 232 } // namespace ash
229 233
230 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 234 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray_controller.cc ('k') | ash/common/system/tray/system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698