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

Unified Diff: mash/wm/frame/default_header_painter.h

Issue 1857623003: convert //mash to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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: mash/wm/frame/default_header_painter.h
diff --git a/mash/wm/frame/default_header_painter.h b/mash/wm/frame/default_header_painter.h
index c2763e69416005f26e1cb8310543483b93b5143c..61d2c6e9f72b86c50ac131c01b5d447610466212 100644
--- a/mash/wm/frame/default_header_painter.h
+++ b/mash/wm/frame/default_header_painter.h
@@ -5,8 +5,9 @@
#ifndef MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_
#define MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_
+#include <memory>
+
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "mash/wm/frame/header_painter.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/animation/animation_delegate.h"
@@ -105,7 +106,7 @@ class 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 | « mash/wm/frame/caption_buttons/frame_caption_button_container_view.h ('k') | mash/wm/frame/move_event_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698