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

Unified Diff: ash/system/date/tray_date.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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/system/date/date_view_unittest.cc ('k') | ash/system/ime/tray_ime_chromeos_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/system/date/tray_date.h
diff --git a/ash/system/date/tray_date.h b/ash/system/date/tray_date.h
index f4667b6046328a32edfd62704f96462f69de4eb7..f3bf4b44a66433a8a3666ae73686c029deae75ce 100644
--- a/ash/system/date/tray_date.h
+++ b/ash/system/date/tray_date.h
@@ -5,11 +5,12 @@
#ifndef ASH_SYSTEM_DATE_TRAY_DATE_H_
#define ASH_SYSTEM_DATE_TRAY_DATE_H_
+#include <memory>
+
#include "ash/ash_export.h"
#include "ash/system/date/clock_observer.h"
#include "ash/system/tray/system_tray_item.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
namespace views {
class Label;
@@ -72,7 +73,7 @@ class ASH_EXPORT TrayDate : public SystemTrayItem, public ClockObserver {
user::LoginStatus login_status_;
#if defined(OS_CHROMEOS)
- scoped_ptr<SystemClockObserver> system_clock_observer_;
+ std::unique_ptr<SystemClockObserver> system_clock_observer_;
#endif
DISALLOW_COPY_AND_ASSIGN(TrayDate);
« no previous file with comments | « ash/system/date/date_view_unittest.cc ('k') | ash/system/ime/tray_ime_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698