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

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

Issue 930403002: Remove remoting::Clipboard::Stop(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 600 matching lines...) Expand 10 before | Expand all | Expand 10 after
611 611
612 clipboard_->Start(client_clipboard.Pass()); 612 clipboard_->Start(client_clipboard.Pass());
613 } 613 }
614 614
615 void InputInjectorX11::Core::Stop() { 615 void InputInjectorX11::Core::Stop() {
616 if (!task_runner_->BelongsToCurrentThread()) { 616 if (!task_runner_->BelongsToCurrentThread()) {
617 task_runner_->PostTask(FROM_HERE, base::Bind(&Core::Stop, this)); 617 task_runner_->PostTask(FROM_HERE, base::Bind(&Core::Stop, this));
618 return; 618 return;
619 } 619 }
620 620
621 clipboard_->Stop(); 621 clipboard_.reset();
622 } 622 }
623 623
624 } // namespace 624 } // namespace
625 625
626 scoped_ptr<InputInjector> InputInjector::Create( 626 scoped_ptr<InputInjector> InputInjector::Create(
627 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner, 627 scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
628 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { 628 scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) {
629 scoped_ptr<InputInjectorX11> injector( 629 scoped_ptr<InputInjectorX11> injector(
630 new InputInjectorX11(main_task_runner)); 630 new InputInjectorX11(main_task_runner));
631 if (!injector->Init()) 631 if (!injector->Init())
632 return nullptr; 632 return nullptr;
633 return injector.Pass(); 633 return injector.Pass();
634 } 634 }
635 635
636 } // namespace remoting 636 } // namespace remoting
OLDNEW
« remoting/host/clipboard_x11.cc ('K') | « remoting/host/clipboard_x11.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698