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

Side by Side Diff: ui/views/window/non_client_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
« no previous file with comments | « ui/views/window/dialog_delegate.cc ('k') | ui/views/window/non_client_view.cc » ('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 UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_ 5 #ifndef UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
6 #define UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_ 6 #define UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "ui/views/view.h" 9 #include "ui/views/view.h"
10 #include "ui/views/view_targeter_delegate.h" 10 #include "ui/views/view_targeter_delegate.h"
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 View* TargetForRect(View* root, const gfx::Rect& rect) override; 248 View* TargetForRect(View* root, const gfx::Rect& rect) override;
249 249
250 // A ClientView object or subclass, responsible for sizing the contents view 250 // A ClientView object or subclass, responsible for sizing the contents view
251 // of the window, hit testing and perhaps other tasks depending on the 251 // of the window, hit testing and perhaps other tasks depending on the
252 // implementation. 252 // implementation.
253 ClientView* client_view_; 253 ClientView* client_view_;
254 254
255 // The NonClientFrameView that renders the non-client portions of the window. 255 // The NonClientFrameView that renders the non-client portions of the window.
256 // This object is not owned by the view hierarchy because it can be replaced 256 // This object is not owned by the view hierarchy because it can be replaced
257 // dynamically as the system settings change. 257 // dynamically as the system settings change.
258 scoped_ptr<NonClientFrameView> frame_view_; 258 std::unique_ptr<NonClientFrameView> frame_view_;
259 259
260 // The overlay view, when non-NULL and visible, takes up the entire widget and 260 // The overlay view, when non-NULL and visible, takes up the entire widget and
261 // is placed on top of the ClientView and NonClientFrameView. 261 // is placed on top of the ClientView and NonClientFrameView.
262 View* overlay_view_; 262 View* overlay_view_;
263 263
264 // The accessible name of this view. 264 // The accessible name of this view.
265 base::string16 accessible_name_; 265 base::string16 accessible_name_;
266 266
267 DISALLOW_COPY_AND_ASSIGN(NonClientView); 267 DISALLOW_COPY_AND_ASSIGN(NonClientView);
268 }; 268 };
269 269
270 } // namespace views 270 } // namespace views
271 271
272 #endif // UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_ 272 #endif // UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
OLDNEW
« no previous file with comments | « ui/views/window/dialog_delegate.cc ('k') | ui/views/window/non_client_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698