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

Side by Side Diff: ash/wm/panels/panel_frame_view.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
« no previous file with comments | « ash/wm/overview/window_selector_unittest.cc ('k') | ash/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_WM_PANELS_PANEL_FRAME_VIEW_H_ 5 #ifndef ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
6 #define ASH_WM_PANELS_PANEL_FRAME_VIEW_H_ 6 #define ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
7 7
8 #include <memory>
9
8 #include "ash/ash_export.h" 10 #include "ash/ash_export.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "ui/views/window/non_client_view.h" 12 #include "ui/views/window/non_client_view.h"
11 13
12 namespace views { 14 namespace views {
13 class ImageView; 15 class ImageView;
14 } 16 }
15 17
16 namespace ash { 18 namespace ash {
17 class DefaultHeaderPainter; 19 class DefaultHeaderPainter;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 void OnPaint(gfx::Canvas* canvas) override; 63 void OnPaint(gfx::Canvas* canvas) override;
62 64
63 // Child View class describing the panel's title bar behavior 65 // Child View class describing the panel's title bar behavior
64 // and buttons, owned by the view hierarchy 66 // and buttons, owned by the view hierarchy
65 views::Widget* frame_; 67 views::Widget* frame_;
66 FrameCaptionButtonContainerView* caption_button_container_; 68 FrameCaptionButtonContainerView* caption_button_container_;
67 views::ImageView* window_icon_; 69 views::ImageView* window_icon_;
68 gfx::Rect client_view_bounds_; 70 gfx::Rect client_view_bounds_;
69 71
70 // Helper class for painting the header. 72 // Helper class for painting the header.
71 scoped_ptr<DefaultHeaderPainter> header_painter_; 73 std::unique_ptr<DefaultHeaderPainter> header_painter_;
72 74
73 // Updates the hittest bounds overrides based on the window state type. 75 // Updates the hittest bounds overrides based on the window state type.
74 scoped_ptr<FrameBorderHitTestController> frame_border_hit_test_controller_; 76 std::unique_ptr<FrameBorderHitTestController>
77 frame_border_hit_test_controller_;
75 78
76 DISALLOW_COPY_AND_ASSIGN(PanelFrameView); 79 DISALLOW_COPY_AND_ASSIGN(PanelFrameView);
77 }; 80 };
78 81
79 } 82 }
80 83
81 #endif // ASH_WM_PANELS_PANEL_FRAME_VIEW_H_ 84 #endif // ASH_WM_PANELS_PANEL_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « ash/wm/overview/window_selector_unittest.cc ('k') | ash/wm/panels/panel_layout_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698