chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm - 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/cocoa/extensions/browser_actions_container_view.mm

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

Index: chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm

diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm

index e7e123fa517fc3abb39c19d05358d7f45af36e4f..0fbe847db4b9c8e56b3c8dcf43d2731de745773b 100644

--- a/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm

+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm

@@ -141,7 +141,7 @@ const CGFloat kMinimumContainerWidth = 3.0;

[super keyDown:theEvent];

}

-- (void)setHighlight:(scoped_ptr<ui::NinePartImageIds>)highlight {

+- (void)setHighlight:(std::unique_ptr<ui::NinePartImageIds>)highlight {

if (highlight || highlight_) {

highlight_ = std::move(highlight);

// We don't allow resizing when the container is highlighting.