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

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

Issue 2217713002: Remove the system menu display settings row (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 3 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/common/system/tray/system_tray.cc ('k') | 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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 virtual void RemoveShutdownPolicyObserver(ShutdownPolicyObserver* observer); 315 virtual void RemoveShutdownPolicyObserver(ShutdownPolicyObserver* observer);
316 316
317 // Determines whether the device is automatically rebooted when shut down as 317 // Determines whether the device is automatically rebooted when shut down as
318 // specified by the device policy |DeviceRebootOnShutdown|. This function 318 // specified by the device policy |DeviceRebootOnShutdown|. This function
319 // asynchronously calls |callback| once a trusted policy becomes available. 319 // asynchronously calls |callback| once a trusted policy becomes available.
320 virtual void ShouldRebootOnShutdown(const RebootOnShutdownCallback& callback); 320 virtual void ShouldRebootOnShutdown(const RebootOnShutdownCallback& callback);
321 321
322 // Returns VPNDelegate. May return nullptr. 322 // Returns VPNDelegate. May return nullptr.
323 virtual VPNDelegate* GetVPNDelegate() const; 323 virtual VPNDelegate* GetVPNDelegate() const;
324 324
325 // Creates a system tray item for display settings.
326 // TODO(jamescook): Remove this when mus has support for display management
327 // and we have a DisplayManager equivalent. See http://crbug.com/548429
328 virtual std::unique_ptr<SystemTrayItem> CreateDisplayTrayItem(
329 SystemTray* tray);
330
331 // Creates a system tray item for display rotation lock. 325 // Creates a system tray item for display rotation lock.
332 // TODO(jamescook): Remove this when mus has support for display management 326 // TODO(jamescook): Remove this when mus has support for display management
333 // and we have a DisplayManager equivalent. See http://crbug.com/548429 327 // and we have a DisplayManager equivalent. See http://crbug.com/548429
334 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem( 328 virtual std::unique_ptr<SystemTrayItem> CreateRotationLockTrayItem(
335 SystemTray* tray); 329 SystemTray* tray);
336 }; 330 };
337 331
338 } // namespace ash 332 } // namespace ash
339 333
340 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 334 #endif // ASH_COMMON_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/common/system/tray/system_tray.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