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

Unified Diff: ash/frame/default_header_painter.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/frame/custom_frame_view_ash_unittest.cc ('k') | ash/frame/default_header_painter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/frame/default_header_painter.h
diff --git a/ash/frame/default_header_painter.h b/ash/frame/default_header_painter.h
index e4fb9b37d716186787a5a965fa6d8faac7b0ae39..dd565513ae18e201ccdd56d10ac92c19bf70bf50 100644
--- a/ash/frame/default_header_painter.h
+++ b/ash/frame/default_header_painter.h
@@ -5,12 +5,13 @@
#ifndef ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
#define ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
+#include <memory>
+
#include "ash/ash_export.h"
#include "ash/frame/header_painter.h"
#include "base/compiler_specific.h" // override
#include "base/gtest_prod_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/animation/animation_delegate.h"
@@ -109,7 +110,7 @@ class ASH_EXPORT DefaultHeaderPainter : public HeaderPainter,
// Whether the header is painted for the first time.
bool initial_paint_;
- scoped_ptr<gfx::SlideAnimation> activation_animation_;
+ std::unique_ptr<gfx::SlideAnimation> activation_animation_;
DISALLOW_COPY_AND_ASSIGN(DefaultHeaderPainter);
};
« no previous file with comments | « ash/frame/custom_frame_view_ash_unittest.cc ('k') | ash/frame/default_header_painter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698