Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(146)

Side by Side Diff: remoting/host/input_injector_linux.cc

Issue 609923004: Cleanup usage of scoped_ptr<> in remoting for C++11 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "remoting/host/input_injector.h" 5 #include "remoting/host/input_injector.h"
6 6
7 #include <X11/extensions/XInput.h> 7 #include <X11/extensions/XInput.h>
8 #include <X11/extensions/XTest.h> 8 #include <X11/extensions/XTest.h>
9 #include <X11/Xlib.h> 9 #include <X11/Xlib.h>
10 #include <X11/XKBlib.h> 10 #include <X11/XKBlib.h>
(...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 } 600 }
601 601
602 } // namespace 602 } // namespace
603 603
604 scoped_ptr<InputInjector> InputInjector::Create( 604 scoped_ptr<InputInjector> InputInjector::Create(
605 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, 605 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
606 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { 606 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
607 scoped_ptr<InputInjectorLinux> injector( 607 scoped_ptr<InputInjectorLinux> injector(
608 new InputInjectorLinux(main_task_runner)); 608 new InputInjectorLinux(main_task_runner));
609 if (!injector->Init()) 609 if (!injector->Init())
610 return scoped_ptr<InputInjector>(); 610 return nullptr;
611 return injector.PassAs<InputInjector>(); 611 return injector.Pass();
612 } 612 }
613 613
614 } // namespace remoting 614 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698