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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ASH_FRAME_DEFAULT_HEADER_PAINTER_H_ 5 #ifndef ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
6 #define ASH_FRAME_DEFAULT_HEADER_PAINTER_H_ 6 #define ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
7 7
8 #include <memory>
9
8 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
9 #include "ash/frame/header_painter.h" 11 #include "ash/frame/header_painter.h"
10 #include "base/compiler_specific.h" // override 12 #include "base/compiler_specific.h" // override
11 #include "base/gtest_prod_util.h" 13 #include "base/gtest_prod_util.h"
12 #include "base/macros.h" 14 #include "base/macros.h"
13 #include "base/memory/scoped_ptr.h"
14 #include "third_party/skia/include/core/SkColor.h" 15 #include "third_party/skia/include/core/SkColor.h"
15 #include "ui/gfx/animation/animation_delegate.h" 16 #include "ui/gfx/animation/animation_delegate.h"
16 17
17 namespace gfx { 18 namespace gfx {
18 class ImageSkia; 19 class ImageSkia;
19 class Rect; 20 class Rect;
20 class SlideAnimation; 21 class SlideAnimation;
21 } 22 }
22 namespace views { 23 namespace views {
23 class View; 24 class View;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 103
103 // The height of the header to paint. 104 // The height of the header to paint.
104 int painted_height_; 105 int painted_height_;
105 106
106 // Whether the header should be painted as active. 107 // Whether the header should be painted as active.
107 Mode mode_; 108 Mode mode_;
108 109
109 // Whether the header is painted for the first time. 110 // Whether the header is painted for the first time.
110 bool initial_paint_; 111 bool initial_paint_;
111 112
112 scoped_ptr<gfx::SlideAnimation> activation_animation_; 113 std::unique_ptr<gfx::SlideAnimation> activation_animation_;
113 114
114 DISALLOW_COPY_AND_ASSIGN(DefaultHeaderPainter); 115 DISALLOW_COPY_AND_ASSIGN(DefaultHeaderPainter);
115 }; 116 };
116 117
117 } // namespace ash 118 } // namespace ash
118 119
119 #endif // ASH_FRAME_DEFAULT_HEADER_PAINTER_H_ 120 #endif // ASH_FRAME_DEFAULT_HEADER_PAINTER_H_
OLDNEW
« 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