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

Unified Diff: ash/display/shared_display_edge_indicator.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: 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
Index: ash/display/shared_display_edge_indicator.h
diff --git a/ash/display/shared_display_edge_indicator.h b/ash/display/shared_display_edge_indicator.h
index d08fd59cb38cd10a51d8d2072a868d0584285bf0..e9e30d7881a2dfdc37d9ddfad392518c2b9dc5b6 100644
--- a/ash/display/shared_display_edge_indicator.h
+++ b/ash/display/shared_display_edge_indicator.h
@@ -5,9 +5,10 @@
#ifndef ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_
#define ASH_DISPLAY_SHARED_DISPLAY_EDGE_INDICATOR_H_
+#include <memory>
+
#include "ash/ash_export.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/gfx/animation/animation_delegate.h"
#include "ui/gfx/display.h"
@@ -47,7 +48,7 @@ class ASH_EXPORT SharedDisplayEdgeIndicator : public gfx::AnimationDelegate {
views::View* dst_indicator_;
// Used to transition the opacity.
- scoped_ptr<gfx::ThrobAnimation> animation_;
+ std::unique_ptr<gfx::ThrobAnimation> animation_;
DISALLOW_COPY_AND_ASSIGN(SharedDisplayEdgeIndicator);
};

Powered by Google App Engine
This is Rietveld 408576698