chrome/browser/ui/cocoa/extensions/browser_actions_container_view.mm - Issue 1579863003: Convert Pass()→std::move() for Mac build.

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 1579863003: Convert Pass()→std::move() for Mac build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 11 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/download/download_shelf_controller_unittest.mm ('k') | chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm » ('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 c2429c41a78b13e99e3c8005d459f2704e56c960..4de33c2da637480e0d84c1fb59a0768f783f4a9f 100644

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

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

@@ -5,6 +5,7 @@

#import "chrome/browser/ui/cocoa/extensions/browser_actions_container_view.h"

#include <algorithm>

+#include <utility>

#import "chrome/browser/ui/cocoa/view_id_util.h"

#include "grit/theme_resources.h"

@@ -167,7 +168,7 @@ const CGFloat kMinimumContainerWidth = 3.0;

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

if (highlight || highlight_) {

- highlight_ = highlight.Pass();

+ highlight_ = std::move(highlight);

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

resizable_ = highlight.get() == nullptr;

[self setNeedsDisplay:YES];