summaryrefslogtreecommitdiffstats
path: root/remoting/host/input_injector_chromeos.cc
diff options
context:
space:
mode:
authorsergeyu <sergeyu@chromium.org>2015-02-17 12:43:20 -0800
committerCommit bot <commit-bot@chromium.org>2015-02-17 20:44:02 +0000
commitd5197934178ef0da1b630792cfbda8ddb6b34388 (patch)
treed8246b3068412ee2afd26655841cd20b772f521c /remoting/host/input_injector_chromeos.cc
parent3c97550d09b3d4b9fc0d81b5a35437e6e211a581 (diff)
downloadchromium_src-d5197934178ef0da1b630792cfbda8ddb6b34388.zip
chromium_src-d5197934178ef0da1b630792cfbda8ddb6b34388.tar.gz
chromium_src-d5197934178ef0da1b630792cfbda8ddb6b34388.tar.bz2
Remove dependency on content from remoting_host.
The host was depending on content just to access content::BrowserThread. It's cleaner to just pass the references to the threads explicitly. BUG=458581 Review URL: https://codereview.chromium.org/929493002 Cr-Commit-Position: refs/heads/master@{#316648}
Diffstat (limited to 'remoting/host/input_injector_chromeos.cc')
-rw-r--r--remoting/host/input_injector_chromeos.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/remoting/host/input_injector_chromeos.cc b/remoting/host/input_injector_chromeos.cc
index 26eeae1..5691191 100644
--- a/remoting/host/input_injector_chromeos.cc
+++ b/remoting/host/input_injector_chromeos.cc
@@ -78,12 +78,9 @@ InputInjectorChromeos::Core::Core(scoped_ptr<ui::SystemInputInjector> delegate,
ui::InputController* input_controller)
: delegate_(delegate.Pass()),
input_controller_(input_controller),
- // Implemented by remoting::ClipboardAura.
- clipboard_(Clipboard::Create()),
saved_auto_repeat_enabled_(false) {
DCHECK(delegate_);
DCHECK(input_controller_);
- DCHECK(clipboard_);
}
void InputInjectorChromeos::Core::InjectClipboardEvent(
@@ -159,6 +156,7 @@ void InputInjectorChromeos::Core::InjectMouseEvent(const MouseEvent& event) {
void InputInjectorChromeos::Core::Start(
scoped_ptr<protocol::ClipboardStub> client_clipboard) {
+ clipboard_.reset(Clipboard::Create());
clipboard_->Start(client_clipboard.Pass());
point_transformer_.reset(new PointTransformer());
}