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

Unified Diff: ui/wm/core/shadow.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/wm/core/image_grid_unittest.cc ('k') | ui/wm/core/shadow_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/wm/core/shadow.h
diff --git a/ui/wm/core/shadow.h b/ui/wm/core/shadow.h
index f5332448ab58808841a22a4126a54f99b2fb301a..813e7a907f1632f16f5a51126b8d618a39d7570b 100644
--- a/ui/wm/core/shadow.h
+++ b/ui/wm/core/shadow.h
@@ -5,8 +5,9 @@
#ifndef UI_WM_CORE_SHADOW_H_
#define UI_WM_CORE_SHADOW_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "ui/compositor/layer_animation_observer.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/wm/wm_export.h"
@@ -69,10 +70,10 @@ class WM_EXPORT Shadow : public ui::ImplicitAnimationObserver {
// The parent layer of the shadow layer. It serves as a container accessible
// from the outside to control the visibility of the shadow.
- scoped_ptr<ui::Layer> layer_;
+ std::unique_ptr<ui::Layer> layer_;
// The actual shadow layer corresponding to a cc::NinePatchLayer.
- scoped_ptr<ui::Layer> shadow_layer_;
+ std::unique_ptr<ui::Layer> shadow_layer_;
// Size of the current shadow image.
gfx::Size image_size_;
« no previous file with comments | « ui/wm/core/image_grid_unittest.cc ('k') | ui/wm/core/shadow_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698