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

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

Issue 1867223004: Convert //ash from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: address comments Created 4 years, 8 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/system/tray/system_tray_bubble.cc ('k') | ash/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_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 5 #ifndef ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 6 #define ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 #include <vector> 10 #include <vector>
10 11
11 #include "ash/ash_export.h" 12 #include "ash/ash_export.h"
12 #include "ash/system/user/login_status.h" 13 #include "ash/system/user/login_status.h"
13 #include "ash/volume_control_delegate.h" 14 #include "ash/volume_control_delegate.h"
14 #include "base/callback_forward.h" 15 #include "base/callback_forward.h"
15 #include "base/files/file_path.h" 16 #include "base/files/file_path.h"
16 #include "base/i18n/time_formatting.h" 17 #include "base/i18n/time_formatting.h"
17 #include "base/memory/scoped_ptr.h"
18 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
19 #include "ui/gfx/image/image_skia.h" 19 #include "ui/gfx/image/image_skia.h"
20 20
21 class AccountId; 21 class AccountId;
22 22
23 namespace base { 23 namespace base {
24 class TimeDelta; 24 class TimeDelta;
25 class TimeTicks; 25 class TimeTicks;
26 } 26 }
27 27
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
288 virtual CastConfigDelegate* GetCastConfigDelegate(); 288 virtual CastConfigDelegate* GetCastConfigDelegate();
289 289
290 // Returns NetworkingConfigDelegate. May return nullptr. 290 // Returns NetworkingConfigDelegate. May return nullptr.
291 virtual NetworkingConfigDelegate* GetNetworkingConfigDelegate() const; 291 virtual NetworkingConfigDelegate* GetNetworkingConfigDelegate() const;
292 292
293 // Returns VolumeControlDelegate. May return nullptr. 293 // Returns VolumeControlDelegate. May return nullptr.
294 virtual VolumeControlDelegate* GetVolumeControlDelegate() const; 294 virtual VolumeControlDelegate* GetVolumeControlDelegate() const;
295 295
296 // Sets the VolumeControlDelegate. 296 // Sets the VolumeControlDelegate.
297 virtual void SetVolumeControlDelegate( 297 virtual void SetVolumeControlDelegate(
298 scoped_ptr<VolumeControlDelegate> delegate); 298 std::unique_ptr<VolumeControlDelegate> delegate);
299 299
300 // Retrieves the session start time. Returns |false| if the time is not set. 300 // Retrieves the session start time. Returns |false| if the time is not set.
301 virtual bool GetSessionStartTime(base::TimeTicks* session_start_time); 301 virtual bool GetSessionStartTime(base::TimeTicks* session_start_time);
302 302
303 // Retrieves the session length limit. Returns |false| if no limit is set. 303 // Retrieves the session length limit. Returns |false| if no limit is set.
304 virtual bool GetSessionLengthLimit(base::TimeDelta* session_length_limit); 304 virtual bool GetSessionLengthLimit(base::TimeDelta* session_length_limit);
305 305
306 // Get the system tray menu size in pixels (dependent on the language). 306 // Get the system tray menu size in pixels (dependent on the language).
307 virtual int GetSystemTrayMenuWidth(); 307 virtual int GetSystemTrayMenuWidth();
308 308
(...skipping 24 matching lines...) Expand all
333 // asynchronously calls |callback| once a trusted policy becomes available. 333 // asynchronously calls |callback| once a trusted policy becomes available.
334 virtual void ShouldRebootOnShutdown(const RebootOnShutdownCallback& callback); 334 virtual void ShouldRebootOnShutdown(const RebootOnShutdownCallback& callback);
335 335
336 // Returns VPNDelegate. May return nullptr. 336 // Returns VPNDelegate. May return nullptr.
337 virtual VPNDelegate* GetVPNDelegate() const; 337 virtual VPNDelegate* GetVPNDelegate() const;
338 }; 338 };
339 339
340 } // namespace ash 340 } // namespace ash
341 341
342 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_ 342 #endif // ASH_SYSTEM_TRAY_SYSTEM_TRAY_DELEGATE_H_
OLDNEW
« no previous file with comments | « ash/system/tray/system_tray_bubble.cc ('k') | ash/system/tray/system_tray_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698