diff options
| author | dcheng <dcheng@chromium.org> | 2015-12-30 20:55:15 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-31 04:56:01 +0000 |
| commit | 023d488b047379f778fccae7e436dd246dc42cdb (patch) | |
| tree | eb0d83dc7821d44c2974992ed7d2c7bd87c5c77a /ui/base | |
| parent | dc5f124021b338adc8caa533583eab97813558fe (diff) | |
| download | chromium_src-023d488b047379f778fccae7e436dd246dc42cdb.zip chromium_src-023d488b047379f778fccae7e436dd246dc42cdb.tar.gz chromium_src-023d488b047379f778fccae7e436dd246dc42cdb.tar.bz2 | |
Convert Pass()→std::move() in //ui (CrOS edition)
(╯^□^)╯︵ ❄☃❄
BUG=557422
R=avi@chromium.org
Review URL: https://codereview.chromium.org/1557683002
Cr-Commit-Position: refs/heads/master@{#367229}
Diffstat (limited to 'ui/base')
| -rw-r--r-- | ui/base/ime/chromeos/component_extension_ime_manager.cc | 3 | ||||
| -rw-r--r-- | ui/base/ime/chromeos/input_method_whitelist.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ui/base/ime/chromeos/component_extension_ime_manager.cc b/ui/base/ime/chromeos/component_extension_ime_manager.cc index d630494..60ae074 100644 --- a/ui/base/ime/chromeos/component_extension_ime_manager.cc +++ b/ui/base/ime/chromeos/component_extension_ime_manager.cc @@ -5,6 +5,7 @@ #include "ui/base/ime/chromeos/component_extension_ime_manager.h" #include <stddef.h> +#include <utility> #include "base/command_line.h" #include "base/logging.h" @@ -118,7 +119,7 @@ ComponentExtensionIMEManager::~ComponentExtensionIMEManager() { void ComponentExtensionIMEManager::Initialize( scoped_ptr<ComponentExtensionIMEManagerDelegate> delegate) { - delegate_ = delegate.Pass(); + delegate_ = std::move(delegate); std::vector<ComponentExtensionIME> ext_list = delegate_->ListIME(); for (size_t i = 0; i < ext_list.size(); ++i) { ComponentExtensionIME& ext = ext_list[i]; diff --git a/ui/base/ime/chromeos/input_method_whitelist.cc b/ui/base/ime/chromeos/input_method_whitelist.cc index ff7bb86c..ab641a5 100644 --- a/ui/base/ime/chromeos/input_method_whitelist.cc +++ b/ui/base/ime/chromeos/input_method_whitelist.cc @@ -59,7 +59,7 @@ InputMethodWhitelist::GetSupportedInputMethods() const { GURL() // input view page url. )); } - return input_methods.Pass(); + return input_methods; } } // namespace input_method |