| Index: remoting/host/single_window_input_injector_mac.cc
|
| diff --git a/remoting/host/single_window_input_injector_mac.cc b/remoting/host/single_window_input_injector_mac.cc
|
| index 333f684058d130e041d4304a227006562c893b71..4b02ddf065587365e41f5025e0b38b032689ff47 100644
|
| --- a/remoting/host/single_window_input_injector_mac.cc
|
| +++ b/remoting/host/single_window_input_injector_mac.cc
|
| @@ -48,15 +48,13 @@ SingleWindowInputInjectorMac::SingleWindowInputInjectorMac(
|
| webrtc::WindowId window_id,
|
| scoped_ptr<InputInjector> input_injector)
|
| : window_id_(static_cast<CGWindowID>(window_id)),
|
| - input_injector_(input_injector.Pass()) {
|
| -}
|
| + input_injector_(std::move(input_injector)) {}
|
|
|
| -SingleWindowInputInjectorMac::~SingleWindowInputInjectorMac() {
|
| -}
|
| +SingleWindowInputInjectorMac::~SingleWindowInputInjectorMac() {}
|
|
|
| void SingleWindowInputInjectorMac::Start(
|
| scoped_ptr<protocol::ClipboardStub> client_clipboard) {
|
| - input_injector_->Start(client_clipboard.Pass());
|
| + input_injector_->Start(std::move(client_clipboard));
|
| }
|
|
|
| void SingleWindowInputInjectorMac::InjectKeyEvent(const KeyEvent& event) {
|
| @@ -163,9 +161,8 @@ CGRect SingleWindowInputInjectorMac::FindCGRectOfWindow() {
|
| scoped_ptr<InputInjector> SingleWindowInputInjector::CreateForWindow(
|
| webrtc::WindowId window_id,
|
| scoped_ptr<InputInjector> input_injector) {
|
| - scoped_ptr<SingleWindowInputInjectorMac> injector(
|
| - new SingleWindowInputInjectorMac(window_id, input_injector.Pass()));
|
| - return injector.Pass();
|
| + return make_scoped_ptr(
|
| + new SingleWindowInputInjectorMac(window_id, std::move(input_injector)));
|
| }
|
|
|
| } // namespace remoting
|
|
|