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

Index: chrome/browser/ui/views/toolbar/toolbar_action_view.cc

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

index c87176112eb2fc28f0ecd23a06a8a614e7899e64..2d3eba4876aec6e4ef68f62624bb1f91bb7718ee 100644

--- a/chrome/browser/ui/views/toolbar/toolbar_action_view.cc

+++ b/chrome/browser/ui/views/toolbar/toolbar_action_view.cc

@@ -95,8 +95,10 @@ void ToolbarActionView::GetAccessibleState(ui::AXViewState* state) {

state->role = ui::AX_ROLE_BUTTON;

}

-scoped_ptr<LabelButtonBorder> ToolbarActionView::CreateDefaultBorder() const {

- scoped_ptr<LabelButtonBorder> border = LabelButton::CreateDefaultBorder();

+std::unique_ptr<LabelButtonBorder> ToolbarActionView::CreateDefaultBorder()

+ const {

+ std::unique_ptr<LabelButtonBorder> border =

+ LabelButton::CreateDefaultBorder();

border->set_insets(gfx::Insets(kBorderInset, kBorderInset,

kBorderInset, kBorderInset));

return border;