summaryrefslogtreecommitdiffstats
path: root/win8
diff options
context:
space:
mode:
authordcheng <dcheng@chromium.org>2016-03-02 15:20:34 -0800
committerCommit bot <commit-bot@chromium.org>2016-03-02 23:21:51 +0000
commit70c494273fa71d922405cba4dc39f5457652a2db (patch)
tree9285f262fe33d8a3d4d9f36f8cd8244caa568ef7 /win8
parent063be11909af7bd64a575259b5ff01eb0686e287 (diff)
downloadchromium_src-70c494273fa71d922405cba4dc39f5457652a2db.zip
chromium_src-70c494273fa71d922405cba4dc39f5457652a2db.tar.gz
chromium_src-70c494273fa71d922405cba4dc39f5457652a2db.tar.bz2
Convert Pass()→std::move() on Windows
Also cleaned up a few stragglers from grepping the source: it's unclear if these are just building with weird defines, don't build at all, only build on obscure platforms, or something else… either way, Pass() itself will be removed shortly after this. BUG=557422 Review URL: https://codereview.chromium.org/1752233002 Cr-Commit-Position: refs/heads/master@{#378872}
Diffstat (limited to 'win8')
-rw-r--r--win8/metro_driver/ime/text_service.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/win8/metro_driver/ime/text_service.cc b/win8/metro_driver/ime/text_service.cc
index 1ad071b..1ee845e 100644
--- a/win8/metro_driver/ime/text_service.cc
+++ b/win8/metro_driver/ime/text_service.cc
@@ -8,6 +8,8 @@
#include <stddef.h>
#include <stdint.h>
+#include <utility>
+
#include "base/logging.h"
#include "base/macros.h"
#include "base/win/scoped_variant.h"
@@ -287,10 +289,8 @@ class DocumentBinding {
LOG(ERROR) << "ITfDocumentMgr::Push failed. hr = " << hr;
return scoped_ptr<DocumentBinding>();
}
- return scoped_ptr<DocumentBinding>(
- new DocumentBinding(text_store,
- document_manager,
- text_edit_sink.Pass()));
+ return scoped_ptr<DocumentBinding>(new DocumentBinding(
+ text_store, document_manager, std::move(text_edit_sink)));
}
ITfDocumentMgr* document_manager() const { return document_manager_.get(); }
@@ -305,7 +305,7 @@ class DocumentBinding {
scoped_ptr<EventSink> text_edit_sink)
: text_store_(text_store),
document_manager_(document_manager),
- text_edit_sink_(text_edit_sink.Pass()) {}
+ text_edit_sink_(std::move(text_edit_sink)) {}
scoped_refptr<TextStore> text_store_;
base::win::ScopedComPtr<ITfDocumentMgr> document_manager_;