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

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: 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
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 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 // Shows the settings related to date, timezone etc. 178 // Shows the settings related to date, timezone etc.
177 virtual void ShowDateSettings(); 179 virtual void ShowDateSettings();
178 180
179 // Shows the dialog to set system time, date, and timezone. 181 // Shows the dialog to set system time, date, and timezone.
180 virtual void ShowSetTimeDialog(); 182 virtual void ShowSetTimeDialog();
181 183
182 // Shows the settings related to network. If |guid| is not empty, 184 // Shows the settings related to network. If |guid| is not empty,
183 // show the settings for the corresponding network. 185 // show the settings for the corresponding network.
184 virtual void ShowNetworkSettingsForGuid(const std::string& guid); 186 virtual void ShowNetworkSettingsForGuid(const std::string& guid);
185 187
188 // Creates the system tray item for display settings.
msw 2016/07/13 18:51:49 nit: Move far down (not amid Show* functions). Des
James Cook 2016/07/13 21:30:46 Done.
189 virtual std::unique_ptr<SystemTrayItem> CreateDisplayTrayItem(
190 SystemTray* tray);
191
186 // Shows settings related to multiple displays. 192 // Shows settings related to multiple displays.
187 virtual void ShowDisplaySettings(); 193 virtual void ShowDisplaySettings();
188 194
189 // Shows settings related to power. 195 // Shows settings related to power.
190 virtual void ShowPowerSettings(); 196 virtual void ShowPowerSettings();
191 197
192 // Shows the page that lets you disable performance tracing. 198 // Shows the page that lets you disable performance tracing.
193 virtual void ShowChromeSlow(); 199 virtual void ShowChromeSlow();
194 200
195 // Returns true if the notification for the display configuration change 201 // Returns true if the notification for the display configuration change
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 // asynchronously calls |callback| once a trusted policy becomes available. 339 // asynchronously calls |callback| once a trusted policy becomes available.
334 virtual void ShouldRebootOnShutdown(const RebootOnShutdownCallback& callback); 340 virtual void ShouldRebootOnShutdown(const RebootOnShutdownCallback& callback);
335 341
336 // Returns VPNDelegate. May return nullptr. 342 // Returns VPNDelegate. May return nullptr.
337 virtual VPNDelegate* GetVPNDelegate() const; 343 virtual VPNDelegate* GetVPNDelegate() const;
338 }; 344 };
339 345
340 } // namespace ash 346 } // namespace ash
341 347
342 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 348 #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') | ash/common/system/tray/system_tray_delegate.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698