summaryrefslogtreecommitdiffstats
path: root/chrome/browser/plugins/plugin_observer.cc
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2016-01-13 02:58:14 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-13 10:59:37 +0000
commitf26eed3771b06cb2bf02e5d02e6f19a20f97a00b (patch)
tree045e2c9c2d63c31431709043ede7b226cfd43821 /chrome/browser/plugins/plugin_observer.cc
parentc1f77e79555cf4cbb4d41f45cc26b70cbcaf4b32 (diff)
downloadchromium_src-f26eed3771b06cb2bf02e5d02e6f19a20f97a00b.zip
chromium_src-f26eed3771b06cb2bf02e5d02e6f19a20f97a00b.tar.gz
chromium_src-f26eed3771b06cb2bf02e5d02e6f19a20f97a00b.tar.bz2
Convert Pass()→std::move() for Mac build.
BUG=557422 R=avi@chromium.org TBR=jam@chromium.org Review URL: https://codereview.chromium.org/1579863003 Cr-Commit-Position: refs/heads/master@{#369135}
Diffstat (limited to 'chrome/browser/plugins/plugin_observer.cc')
-rw-r--r--chrome/browser/plugins/plugin_observer.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc
index 8385774..10f80d6 100644
--- a/chrome/browser/plugins/plugin_observer.cc
+++ b/chrome/browser/plugins/plugin_observer.cc
@@ -4,6 +4,8 @@
#include "chrome/browser/plugins/plugin_observer.h"
+#include <utility>
+
#include "base/auto_reset.h"
#include "base/bind.h"
#include "base/debug/crash_logging.h"
@@ -87,8 +89,7 @@ ConfirmInstallDialogDelegate::ConfirmInstallDialogDelegate(
: TabModalConfirmDialogDelegate(web_contents),
WeakPluginInstallerObserver(installer),
web_contents_(web_contents),
- plugin_metadata_(plugin_metadata.Pass()) {
-}
+ plugin_metadata_(std::move(plugin_metadata)) {}
base::string16 ConfirmInstallDialogDelegate::GetTitle() {
return l10n_util::GetStringFUTF16(
@@ -379,8 +380,9 @@ void PluginObserver::OnBlockedOutdatedPlugin(int placeholder_id,
if (finder->FindPluginWithIdentifier(identifier, &installer, &plugin)) {
plugin_placeholders_[placeholder_id] = new PluginPlaceholderHost(
this, placeholder_id, plugin->name(), installer);
- OutdatedPluginInfoBarDelegate::Create(InfoBarService::FromWebContents(
- web_contents()), installer, plugin.Pass());
+ OutdatedPluginInfoBarDelegate::Create(
+ InfoBarService::FromWebContents(web_contents()), installer,
+ std::move(plugin));
} else {
NOTREACHED();
}