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

Index: chrome/browser/ui/views/exclusive_access_bubble_views.cc

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

index e19da2d278d712c22b3a3102438893b75a261ab3..fa106bf53b5056d40f21af9a73724729ee8dde75 100644

--- a/chrome/browser/ui/views/exclusive_access_bubble_views.cc

+++ b/chrome/browser/ui/views/exclusive_access_bubble_views.cc

@@ -145,7 +145,7 @@ InstructionView::InstructionView(const base::string16& text,

key_name_->SetLayoutManager(key_name_layout);

key_name_->AddChildView(key_name_label_);

// The key name has a border around it.

- scoped_ptr<views::Border> border(views::Border::CreateRoundedRectBorder(

+ std::unique_ptr<views::Border> border(views::Border::CreateRoundedRectBorder(

kKeyNameBorderPx, kKeyNameCornerRadius, foreground_color));

key_name_->SetBorder(std::move(border));

AddChildView(key_name_);

@@ -253,7 +253,7 @@ ExclusiveAccessBubbleViews::ExclusiveAccessView::ExclusiveAccessView(

? SK_ColorWHITE

: theme->GetSystemColor(ui::NativeTheme::kColorId_LabelEnabledColor);

- scoped_ptr<views::BubbleBorder> bubble_border(new views::BubbleBorder(

+ std::unique_ptr<views::BubbleBorder> bubble_border(new views::BubbleBorder(

views::BubbleBorder::NONE, shadow_type, background_color));

set_background(new views::BubbleBackground(bubble_border.get()));

SetBorder(std::move(bubble_border));