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

Unified Diff: ash/display/display_animator_chromeos.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/display/cursor_window_controller.h ('k') | ash/display/display_color_manager_chromeos.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/display/display_animator_chromeos.h
diff --git a/ash/display/display_animator_chromeos.h b/ash/display/display_animator_chromeos.h
index a4fc768ff9ca32f659e54401c850e2756916e753..a3e44ff88396141e7cc2400fc1f1cce912a775ab 100644
--- a/ash/display/display_animator_chromeos.h
+++ b/ash/display/display_animator_chromeos.h
@@ -6,6 +6,7 @@
#define ASH_DISPLAY_DISPLAY_ANIMATOR_CHROMEOS_H_
#include <map>
+#include <memory>
#include "ash/ash_export.h"
#include "ash/display/display_animator.h"
@@ -55,7 +56,7 @@ class ASH_EXPORT DisplayAnimatorChromeOS
void ClearHidingLayers();
std::map<aura::Window*, ui::Layer*> hiding_layers_;
- scoped_ptr<base::OneShotTimer> timer_;
+ std::unique_ptr<base::OneShotTimer> timer_;
base::WeakPtrFactory<DisplayAnimatorChromeOS> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(DisplayAnimatorChromeOS);
« no previous file with comments | « ash/display/cursor_window_controller.h ('k') | ash/display/display_color_manager_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698