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

Unified Diff: ui/message_center/popup_timer.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 | « ui/message_center/notification_list_unittest.cc ('k') | ui/message_center/popup_timers_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/message_center/popup_timer.h
diff --git a/ui/message_center/popup_timer.h b/ui/message_center/popup_timer.h
index 8fa39eb3ff33147a04ded4985c9dc8912af1cdec..fb3ef775f2f44cd3e23c300393bfe990a560a6c6 100644
--- a/ui/message_center/popup_timer.h
+++ b/ui/message_center/popup_timer.h
@@ -5,10 +5,10 @@
#ifndef UI_MESSAGE_CENTER_POPUP_TIMER_H_
#define UI_MESSAGE_CENTER_POPUP_TIMER_H_
+#include <memory>
#include <string>
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/time/time.h"
#include "base/timer/timer.h"
@@ -64,7 +64,7 @@ class PopupTimer {
base::WeakPtr<Delegate> timer_delegate_;
// The actual timer.
- scoped_ptr<base::OneShotTimer> timer_;
+ std::unique_ptr<base::OneShotTimer> timer_;
DISALLOW_COPY_AND_ASSIGN(PopupTimer);
};
« no previous file with comments | « ui/message_center/notification_list_unittest.cc ('k') | ui/message_center/popup_timers_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698