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

Side by Side Diff: ui/views/controls/tree/tree_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_CONTROLS_TREE_TREE_VIEW_VIEWS_H_ 5 #ifndef UI_VIEWS_CONTROLS_TREE_TREE_VIEW_VIEWS_H_
6 #define UI_VIEWS_CONTROLS_TREE_TREE_VIEW_VIEWS_H_ 6 #define UI_VIEWS_CONTROLS_TREE_TREE_VIEW_VIEWS_H_
7 7
8 #include <memory>
8 #include <vector> 9 #include <vector>
9 10
10 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
11 #include "base/macros.h" 12 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "ui/base/models/tree_node_model.h" 13 #include "ui/base/models/tree_node_model.h"
14 #include "ui/gfx/font_list.h" 14 #include "ui/gfx/font_list.h"
15 #include "ui/gfx/image/image_skia.h" 15 #include "ui/gfx/image/image_skia.h"
16 #include "ui/views/controls/prefix_delegate.h" 16 #include "ui/views/controls/prefix_delegate.h"
17 #include "ui/views/controls/textfield/textfield_controller.h" 17 #include "ui/views/controls/textfield/textfield_controller.h"
18 #include "ui/views/focus/focus_manager.h" 18 #include "ui/views/focus/focus_manager.h"
19 #include "ui/views/view.h" 19 #include "ui/views/view.h"
20 20
21 namespace gfx { 21 namespace gfx {
22 class Rect; 22 class Rect;
(...skipping 356 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 // Font list used to display text. 379 // Font list used to display text.
380 gfx::FontList font_list_; 380 gfx::FontList font_list_;
381 381
382 // Height of each row. Based on font and some padding. 382 // Height of each row. Based on font and some padding.
383 int row_height_; 383 int row_height_;
384 384
385 // Offset the text is drawn at. This accounts for the size of the expand 385 // Offset the text is drawn at. This accounts for the size of the expand
386 // control, icon and offsets. 386 // control, icon and offsets.
387 int text_offset_; 387 int text_offset_;
388 388
389 scoped_ptr<PrefixSelector> selector_; 389 std::unique_ptr<PrefixSelector> selector_;
390 390
391 DISALLOW_COPY_AND_ASSIGN(TreeView); 391 DISALLOW_COPY_AND_ASSIGN(TreeView);
392 }; 392 };
393 393
394 } // namespace views 394 } // namespace views
395 395
396 #endif // UI_VIEWS_CONTROLS_TREE_TREE_VIEW_VIEWS_H_ 396 #endif // UI_VIEWS_CONTROLS_TREE_TREE_VIEW_VIEWS_H_
OLDNEW
« no previous file with comments | « ui/views/controls/textfield/textfield_unittest.cc ('k') | ui/views/controls/webview/web_dialog_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698