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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/wm/window_animations.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/wm/video_detector_unittest.cc ('k') | ash/wm/window_animations.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/window_animations.h
diff --git a/ash/wm/window_animations.h b/ash/wm/window_animations.h
index 8d3e1980f7e1c97580c4e8d51a4c4814e09a321d..2e5d24bdbefb0393eb2e748a0cd660f753335cf2 100644
--- a/ash/wm/window_animations.h
+++ b/ash/wm/window_animations.h
@@ -5,8 +5,9 @@
#ifndef ASH_WM_WINDOW_ANIMATIONS_H_
#define ASH_WM_WINDOW_ANIMATIONS_H_
+#include <memory>
+
#include "ash/ash_export.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/gfx/animation/tween.h"
#include "ui/gfx/transform.h"
#include "ui/wm/core/window_animations.h"
@@ -51,7 +52,7 @@ extern const int kCrossFadeDurationMS;
// animation.
ASH_EXPORT base::TimeDelta CrossFadeAnimation(
aura::Window* window,
- scoped_ptr<ui::LayerTreeOwner> old_layer_owner,
+ std::unique_ptr<ui::LayerTreeOwner> old_layer_owner,
gfx::Tween::Type tween_type);
ASH_EXPORT bool AnimateOnChildWindowVisibilityChanged(aura::Window* window,
« no previous file with comments | « ash/wm/video_detector_unittest.cc ('k') | ash/wm/window_animations.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698