chrome/browser/ui/views/website_settings/chosen_object_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/website_settings/chosen_object_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/website_settings/chooser_bubble_ui_view.cc ('k') | chrome/browser/ui/views/website_settings/chosen_object_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/website_settings/chosen_object_view.h

diff --git a/chrome/browser/ui/views/website_settings/chosen_object_view.h b/chrome/browser/ui/views/website_settings/chosen_object_view.h

index f462eb25d0b25a6ba6c671e9dbf9c31e664ea035..fafd59e44dd971882912fbcdb09340300252b938 100644

--- a/chrome/browser/ui/views/website_settings/chosen_object_view.h

+++ b/chrome/browser/ui/views/website_settings/chosen_object_view.h

@@ -23,7 +23,7 @@ class ChosenObjectViewObserver;

class ChosenObjectView : public views::View, public views::ButtonListener {

public:

explicit ChosenObjectView(

- scoped_ptr<WebsiteSettingsUI::ChosenObjectInfo> info);

+ std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo> info);

void AddObserver(ChosenObjectViewObserver* observer);

@@ -37,7 +37,7 @@ class ChosenObjectView : public views::View, public views::ButtonListener {

views::ImageButton* delete_button_; // Owned by the views hierarchy.

base::ObserverList<ChosenObjectViewObserver> observer_list_;

- scoped_ptr<WebsiteSettingsUI::ChosenObjectInfo> info_;

+ std::unique_ptr<WebsiteSettingsUI::ChosenObjectInfo> info_;

DISALLOW_COPY_AND_ASSIGN(ChosenObjectView);

};