summaryrefslogtreecommitdiffstats
path: root/ios/chrome/browser/infobars
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2016-01-13 20:41:45 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-14 04:43:33 +0000
commit5e05b437032ffeb7bf9da7dcf1355fc668a33a9d (patch)
tree5ce11c333ab085b2bb85cb8c989225f504c0c293 /ios/chrome/browser/infobars
parente8ecfb59d4f906e0ab40b6046406b8af1366cb10 (diff)
downloadchromium_src-5e05b437032ffeb7bf9da7dcf1355fc668a33a9d.zip
chromium_src-5e05b437032ffeb7bf9da7dcf1355fc668a33a9d.tar.gz
chromium_src-5e05b437032ffeb7bf9da7dcf1355fc668a33a9d.tar.bz2
Convert Pass()→std::move() for iOS build.
BUG=557422 R=rickyz@chromium.org TBR=jam@chromium.org Review URL: https://codereview.chromium.org/1586833002 Cr-Commit-Position: refs/heads/master@{#369328}
Diffstat (limited to 'ios/chrome/browser/infobars')
-rw-r--r--ios/chrome/browser/infobars/infobar.mm5
-rw-r--r--ios/chrome/browser/infobars/infobar_manager_impl.cc4
-rw-r--r--ios/chrome/browser/infobars/infobar_utils.mm6
3 files changed, 10 insertions, 5 deletions
diff --git a/ios/chrome/browser/infobars/infobar.mm b/ios/chrome/browser/infobars/infobar.mm
index b7f7453..00ae46b 100644
--- a/ios/chrome/browser/infobars/infobar.mm
+++ b/ios/chrome/browser/infobars/infobar.mm
@@ -4,6 +4,8 @@
#include "ios/chrome/browser/infobars/infobar.h"
+#include <utility>
+
#include "base/logging.h"
#include "components/infobars/core/confirm_infobar_delegate.h"
#include "components/translate/core/browser/translate_infobar_delegate.h"
@@ -15,8 +17,7 @@ using infobars::InfoBar;
using infobars::InfoBarDelegate;
InfoBarIOS::InfoBarIOS(scoped_ptr<InfoBarDelegate> delegate)
- : InfoBar(delegate.Pass()) {
-}
+ : InfoBar(std::move(delegate)) {}
InfoBarIOS::~InfoBarIOS() {
DCHECK(controller_);
diff --git a/ios/chrome/browser/infobars/infobar_manager_impl.cc b/ios/chrome/browser/infobars/infobar_manager_impl.cc
index 551268b..57b95db 100644
--- a/ios/chrome/browser/infobars/infobar_manager_impl.cc
+++ b/ios/chrome/browser/infobars/infobar_manager_impl.cc
@@ -4,6 +4,8 @@
#include "ios/chrome/browser/infobars/infobar_manager_impl.h"
+#include <utility>
+
#include "components/infobars/core/confirm_infobar_delegate.h"
#include "components/infobars/core/infobar.h"
#include "components/infobars/core/infobar_delegate.h"
@@ -62,7 +64,7 @@ int InfoBarManagerImpl::GetActiveEntryID() {
scoped_ptr<infobars::InfoBar> InfoBarManagerImpl::CreateConfirmInfoBar(
scoped_ptr<ConfirmInfoBarDelegate> delegate) {
- return ::CreateConfirmInfoBar(delegate.Pass());
+ return ::CreateConfirmInfoBar(std::move(delegate));
}
void InfoBarManagerImpl::NavigationItemCommitted(
diff --git a/ios/chrome/browser/infobars/infobar_utils.mm b/ios/chrome/browser/infobars/infobar_utils.mm
index e4643df..f3e9a0b 100644
--- a/ios/chrome/browser/infobars/infobar_utils.mm
+++ b/ios/chrome/browser/infobars/infobar_utils.mm
@@ -4,6 +4,8 @@
#include "ios/chrome/browser/infobars/infobar_utils.h"
+#include <utility>
+
#include "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "components/infobars/core/confirm_infobar_delegate.h"
@@ -12,9 +14,9 @@
scoped_ptr<infobars::InfoBar> CreateConfirmInfoBar(
scoped_ptr<ConfirmInfoBarDelegate> delegate) {
- scoped_ptr<InfoBarIOS> infobar(new InfoBarIOS(delegate.Pass()));
+ scoped_ptr<InfoBarIOS> infobar(new InfoBarIOS(std::move(delegate)));
base::scoped_nsobject<ConfirmInfoBarController> controller(
[[ConfirmInfoBarController alloc] initWithDelegate:infobar.get()]);
infobar->SetController(controller);
- return infobar.Pass();
+ return std::move(infobar);
}