chrome/browser/ui/views/proximity_auth/proximity_auth_error_bubble_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/proximity_auth/proximity_auth_error_bubble_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/profiles/user_manager_view.cc ('k') | chrome/browser/ui/views/renderer_context_menu/render_view_context_menu_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.cc

diff --git a/chrome/browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.cc b/chrome/browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.cc

index 49c8836409547be53017a10c010147c689621538..707967a2f2e9e795e240aeabd77dd0d05e567140 100644

--- a/chrome/browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.cc

+++ b/chrome/browser/ui/views/proximity_auth/proximity_auth_error_bubble_view.cc

@@ -88,7 +88,7 @@ ProximityAuthErrorBubbleView::ProximityAuthErrorBubbleView(

// ----------------------------

// | icon | padding | message |

// ----------------------------

- scoped_ptr<views::GridLayout> layout(new views::GridLayout(this));

+ std::unique_ptr<views::GridLayout> layout(new views::GridLayout(this));

views::ColumnSet* columns = layout->AddColumnSet(0);

columns->AddColumn(views::GridLayout::LEADING, views::GridLayout::LEADING, 0,

views::GridLayout::USE_PREF, 0, 0);

@@ -97,11 +97,12 @@ ProximityAuthErrorBubbleView::ProximityAuthErrorBubbleView(

views::GridLayout::USE_PREF, 0, 0);

// Construct the views.

- scoped_ptr<views::ImageView> warning_icon(new views::ImageView());

+ std::unique_ptr<views::ImageView> warning_icon(new views::ImageView());

ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();

warning_icon->SetImage(*bundle.GetImageSkiaNamed(IDR_WARNING));

- scoped_ptr<views::StyledLabel> label(new views::StyledLabel(message, this));

+ std::unique_ptr<views::StyledLabel> label(

+ new views::StyledLabel(message, this));

if (!link_range.is_empty()) {

label->AddStyleRange(link_range,

views::StyledLabel::RangeStyleInfo::CreateForLink());