chrome/browser/ui/views/website_settings/website_settings_popup_view.cc - 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/website_settings_popup_view.cc

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

Index: chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

diff --git a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

index c82a5c91fe0927a4e05c52619e0f23e8390e58f0..0b36a8e880443aa8dcf40a7e2b204d6063638e0e 100644

--- a/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

+++ b/chrome/browser/ui/views/website_settings/website_settings_popup_view.cc

@@ -11,6 +11,7 @@

#include "base/i18n/rtl.h"

#include "base/macros.h"

+#include "base/memory/ptr_util.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/string_util.h"

#include "base/strings/utf_string_conversions.h"

@@ -666,7 +667,7 @@ void WebsiteSettingsPopupView::SetPermissionInfo(

for (auto object : chosen_object_info_list) {

layout->StartRow(1, content_column);

// The view takes ownership of the object info.

- auto object_view = new ChosenObjectView(make_scoped_ptr(object));

+ auto object_view = new ChosenObjectView(base::WrapUnique(object));

object_view->AddObserver(this);

layout->AddView(object_view, 1, 1, views::GridLayout::LEADING,

views::GridLayout::CENTER);