chrome/browser/ui/views/bookmarks/bookmark_editor_view.h - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/bookmarks/bookmark_editor_view.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/bookmarks/bookmark_editor_view.h

diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h

index d93ab569a910bd33d467b4abb3b957c7f0cf58ca..a601c30969cd53001536a400e3affe6c79b51f1b 100644

--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h

+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h

@@ -229,13 +229,13 @@ class BookmarkEditorView : public BookmarkEditor,

Profile* profile_;

// Model driving the TreeView.

- scoped_ptr<EditorTreeModel> tree_model_;

+ std::unique_ptr<EditorTreeModel> tree_model_;

// Displays star folder.

views::TreeView* tree_view_;

// Used to create a new folder.

- scoped_ptr<views::LabelButton> new_folder_button_;

+ std::unique_ptr<views::LabelButton> new_folder_button_;

// The label for the url text field.

views::Label* url_label_;

@@ -256,8 +256,8 @@ class BookmarkEditorView : public BookmarkEditor,

const EditDetails details_;

// The context menu.

- scoped_ptr<ui::SimpleMenuModel> context_menu_model_;

- scoped_ptr<views::MenuRunner> context_menu_runner_;

+ std::unique_ptr<ui::SimpleMenuModel> context_menu_model_;

+ std::unique_ptr<views::MenuRunner> context_menu_runner_;

// Mode used to create nodes from.

bookmarks::BookmarkModel* bb_model_;