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

Side by Side 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, 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_ 5 #ifndef MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_
6 #define MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_ 6 #define MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_
7 7
8 #include <memory>
9
8 #include "base/macros.h" 10 #include "base/macros.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "mash/wm/frame/header_painter.h" 11 #include "mash/wm/frame/header_painter.h"
11 #include "third_party/skia/include/core/SkColor.h" 12 #include "third_party/skia/include/core/SkColor.h"
12 #include "ui/gfx/animation/animation_delegate.h" 13 #include "ui/gfx/animation/animation_delegate.h"
13 14
14 namespace gfx { 15 namespace gfx {
15 class ImageSkia; 16 class ImageSkia;
16 class Rect; 17 class Rect;
17 class SlideAnimation; 18 class SlideAnimation;
18 } 19 }
19 namespace views { 20 namespace views {
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 99
99 // The height of the header to paint. 100 // The height of the header to paint.
100 int painted_height_; 101 int painted_height_;
101 102
102 // Whether the header should be painted as active. 103 // Whether the header should be painted as active.
103 Mode mode_; 104 Mode mode_;
104 105
105 // Whether the header is painted for the first time. 106 // Whether the header is painted for the first time.
106 bool initial_paint_; 107 bool initial_paint_;
107 108
108 scoped_ptr<gfx::SlideAnimation> activation_animation_; 109 std::unique_ptr<gfx::SlideAnimation> activation_animation_;
109 110
110 DISALLOW_COPY_AND_ASSIGN(DefaultHeaderPainter); 111 DISALLOW_COPY_AND_ASSIGN(DefaultHeaderPainter);
111 }; 112 };
112 113
113 } // namespace wm 114 } // namespace wm
114 } // namespace mash 115 } // namespace mash
115 116
116 #endif // MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_ 117 #endif // MASH_WM_FRAME_DEFAULT_HEADER_PAINTER_H_
OLDNEW
« 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