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

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

Issue 2148943002: mash: Create system tray display and rotation lock items via delegate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments, add rotation lock Created 4 years, 5 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 | « no previous file | ash/common/system/tray/system_tray_delegate.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 (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 11 matching lines...) Expand all
22 22
23 namespace base { 23 namespace base {
24 class TimeDelta; 24 class TimeDelta;
25 class TimeTicks; 25 class TimeTicks;
26 } 26 }
27 27
28 namespace ash { 28 namespace ash {
29 29
30 class CustodianInfoTrayObserver; 30 class CustodianInfoTrayObserver;
31 class ShutdownPolicyObserver; 31 class ShutdownPolicyObserver;
32 class SystemTray;
33 class SystemTrayItem;
32 34
33 struct ASH_EXPORT NetworkIconInfo { 35 struct ASH_EXPORT NetworkIconInfo {
34 NetworkIconInfo(); 36 NetworkIconInfo();
35 ~NetworkIconInfo(); 37 ~NetworkIconInfo();
36 38
37 bool highlight() const { return connected || connecting; } 39 bool highlight() const { return connected || connecting; }
38 40
39 bool connecting; 41 bool connecting;
40 bool connected; 42 bool connected;
41 bool tray_icon_visible; 43 bool tray_icon_visible;
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 330
329 virtual void RemoveShutdownPolicyObserver(ShutdownPolicyObserver* observer); 331 virtual void RemoveShutdownPolicyObserver(ShutdownPolicyObserver* observer);
330 332
331 // Determines whether the device is automatically rebooted when shut down as 333 // Determines whether the device is automatically rebooted when shut down as
332 // specified by the device policy |DeviceRebootOnShutdown|. This function 334 // specified by the device policy |DeviceRebootOnShutdown|. This function
333 // asynchronously calls |callback| once a trusted policy becomes available. 335 // asynchronously calls |callback| once a trusted policy becomes available.
334 virtual void ShouldRebootOnShutdown(const RebootOnShutdownCallback& callback); 336 virtual void ShouldRebootOnShutdown(const RebootOnShutdownCallback& callback);
335 337
336 // Returns VPNDelegate. May return nullptr. 338 // Returns VPNDelegate. May return nullptr.
337 virtual VPNDelegate* GetVPNDelegate() const; 339 virtual VPNDelegate* GetVPNDelegate() const;
340
341 // Creates a system tray item for display settings.
342 // TODO(jamescook): Remove this when mus has support for display management
343 // and we have a DisplayManager equivalent. See http://crbug.com/548429
344 virtual std::unique_ptr<SystemTrayItem> CreateDisplayTrayItem(
345 SystemTray* tray);
346
347 // Creates a system tray item for display rotation lock.
348 // TODO(jamescook): Remove this when mus has support for display management
349 // and we have a DisplayManager equivalent. See http://crbug.com/548429
350 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem(
351 SystemTray* tray);
338 }; 352 };
339 353
340 } // namespace ash 354 } // namespace ash
341 355
342 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 356 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « no previous file | ash/common/system/tray/system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698