Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Unified Diff: chrome/browser/ui/cocoa/extensions/browser_actions_controller.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
Index: chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
index 71d31d7786caa8546c9a1509231aa7d84d743bef..c01b9f8ddc6eb683172d833b66cd233255527057 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
@@ -7,6 +7,7 @@
#include <stddef.h>
#include <string>
+#include <utility>
#include "base/macros.h"
#include "base/strings/sys_string_conversions.h"
@@ -289,10 +290,10 @@ void ToolbarActionsBarBridge::ShowExtensionMessageBubble(
extensions::ExtensionMessageBubbleController* weak_controller =
bubble_controller.get();
scoped_ptr<ExtensionMessageBubbleBridge> bridge(
- new ExtensionMessageBubbleBridge(bubble_controller.Pass(),
+ new ExtensionMessageBubbleBridge(std::move(bubble_controller),
anchor_action != nullptr));
ToolbarActionsBarBubbleMac* bubble =
- [controller_ createMessageBubble:bridge.Pass()
+ [controller_ createMessageBubble:std::move(bridge)
anchorToSelf:anchor_action != nil];
weak_controller->OnShown();
[bubble showWindow:nil];
@@ -570,7 +571,7 @@ void ToolbarActionsBarBridge::ShowExtensionMessageBubble(
highlight.reset(
new ui::NinePartImageIds(IMAGE_GRID(IDR_DEVELOPER_MODE_HIGHLIGHT)));
}
- [containerView_ setHighlight:highlight.Pass()];
+ [containerView_ setHighlight:std::move(highlight)];
std::vector<ToolbarActionViewController*> toolbar_actions =
toolbarActionsBar_->GetActions();
@@ -812,8 +813,7 @@ void ToolbarActionsBarBridge::ShowExtensionMessageBubble(
scoped_ptr<ToolbarActionsBarBubbleDelegate> delegate(
new ExtensionToolbarIconSurfacingBubbleDelegate(browser_->profile()));
ToolbarActionsBarBubbleMac* bubble =
- [self createMessageBubble:delegate.Pass()
- anchorToSelf:YES];
+ [self createMessageBubble:std::move(delegate) anchorToSelf:YES];
[bubble showWindow:nil];
}
[containerView_ setTrackingEnabled:NO];
@@ -1034,7 +1034,7 @@ void ToolbarActionsBarBridge::ShowExtensionMessageBubble(
activeBubble_ = [[ToolbarActionsBarBubbleMac alloc]
initWithParentWindow:[containerView_ window]
anchorPoint:anchor
- delegate:delegate.Pass()];
+ delegate:std::move(delegate)];
[[NSNotificationCenter defaultCenter]
addObserver:self
selector:@selector(bubbleWindowClosing:)

Powered by Google App Engine
This is Rietveld 408576698