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

Side by Side Diff: chrome/browser/ui/views/frame/browser_header_painter_ash.h

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase 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 CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_
7 7
8 #include <memory>
9
8 #include "ash/frame/header_painter.h" 10 #include "ash/frame/header_painter.h"
9 #include "base/compiler_specific.h" // override 11 #include "base/compiler_specific.h" // override
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "third_party/skia/include/core/SkColor.h" 13 #include "third_party/skia/include/core/SkColor.h"
13 #include "ui/gfx/animation/animation_delegate.h" 14 #include "ui/gfx/animation/animation_delegate.h"
14 15
15 class BrowserNonClientFrameViewAsh; 16 class BrowserNonClientFrameViewAsh;
16 class BrowserView; 17 class BrowserView;
17 18
18 namespace ash { 19 namespace ash {
19 class FrameCaptionButtonContainerView; 20 class FrameCaptionButtonContainerView;
20 } 21 }
21 22
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 views::View* window_icon_; 93 views::View* window_icon_;
93 ash::FrameCaptionButtonContainerView* caption_button_container_; 94 ash::FrameCaptionButtonContainerView* caption_button_container_;
94 int painted_height_; 95 int painted_height_;
95 96
96 // Whether the header is painted for the first time. 97 // Whether the header is painted for the first time.
97 bool initial_paint_; 98 bool initial_paint_;
98 99
99 // Whether the header should be painted as active. 100 // Whether the header should be painted as active.
100 Mode mode_; 101 Mode mode_;
101 102
102 scoped_ptr<gfx::SlideAnimation> activation_animation_; 103 std::unique_ptr<gfx::SlideAnimation> activation_animation_;
103 104
104 DISALLOW_COPY_AND_ASSIGN(BrowserHeaderPainterAsh); 105 DISALLOW_COPY_AND_ASSIGN(BrowserHeaderPainterAsh);
105 }; 106 };
106 107
107 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_ 108 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_HEADER_PAINTER_ASH_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/frame/browser_frame_ash.cc ('k') | chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698