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

Side by Side Diff: ui/views/window/custom_frame_view.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr 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 (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 UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ 5 #ifndef UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
6 #define UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ 6 #define UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
7 7
8 #include <memory>
9
8 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
9 #include "base/macros.h" 11 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h"
11 #include "ui/gfx/image/image_skia.h" 12 #include "ui/gfx/image/image_skia.h"
12 #include "ui/views/controls/button/button.h" 13 #include "ui/views/controls/button/button.h"
13 #include "ui/views/window/frame_buttons.h" 14 #include "ui/views/window/frame_buttons.h"
14 #include "ui/views/window/non_client_view.h" 15 #include "ui/views/window/non_client_view.h"
15 16
16 namespace views { 17 namespace views {
17 18
18 class FrameBackground; 19 class FrameBackground;
19 class ImageButton; 20 class ImageButton;
20 class Widget; 21 class Widget;
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 // The icon of this window. May be NULL. 138 // The icon of this window. May be NULL.
138 ImageButton* window_icon_; 139 ImageButton* window_icon_;
139 140
140 // Window caption buttons. 141 // Window caption buttons.
141 ImageButton* minimize_button_; 142 ImageButton* minimize_button_;
142 ImageButton* maximize_button_; 143 ImageButton* maximize_button_;
143 ImageButton* restore_button_; 144 ImageButton* restore_button_;
144 ImageButton* close_button_; 145 ImageButton* close_button_;
145 146
146 // Background painter for the window frame. 147 // Background painter for the window frame.
147 scoped_ptr<FrameBackground> frame_background_; 148 std::unique_ptr<FrameBackground> frame_background_;
148 149
149 // The horizontal boundaries for the title bar to layout within. Restricted 150 // The horizontal boundaries for the title bar to layout within. Restricted
150 // by the space used by the leading and trailing buttons. 151 // by the space used by the leading and trailing buttons.
151 int minimum_title_bar_x_; 152 int minimum_title_bar_x_;
152 int maximum_title_bar_x_; 153 int maximum_title_bar_x_;
153 154
154 DISALLOW_COPY_AND_ASSIGN(CustomFrameView); 155 DISALLOW_COPY_AND_ASSIGN(CustomFrameView);
155 }; 156 };
156 157
157 } // namespace views 158 } // namespace views
158 159
159 #endif // UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_ 160 #endif // UI_VIEWS_WINDOW_CUSTOM_FRAME_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/win/windows_session_change_observer.cc ('k') | ui/views/window/dialog_client_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698