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

Unified Diff: remoting/host/input_injector_chromeos.cc

Issue 932233002: Revert of Fix breaking change in It2me Host on Ozone (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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/input_injector_chromeos.cc
diff --git a/remoting/host/input_injector_chromeos.cc b/remoting/host/input_injector_chromeos.cc
index 04722ffcb5506a95bf8951043d6a8c29dbe71584..c58110a7f9ff51eda6786317dff4126e690a721b 100644
--- a/remoting/host/input_injector_chromeos.cc
+++ b/remoting/host/input_injector_chromeos.cc
@@ -74,7 +74,13 @@
DISALLOW_COPY_AND_ASSIGN(Core);
};
-InputInjectorChromeos::Core::Core() : saved_auto_repeat_enabled_(false) {
+InputInjectorChromeos::Core::Core(scoped_ptr<ui::SystemInputInjector> delegate,
+ ui::InputController* input_controller)
+ : delegate_(delegate.Pass()),
+ input_controller_(input_controller),
+ saved_auto_repeat_enabled_(false) {
+ DCHECK(delegate_);
+ DCHECK(input_controller_);
}
void InputInjectorChromeos::Core::InjectClipboardEvent(
@@ -150,13 +156,6 @@
void InputInjectorChromeos::Core::Start(
scoped_ptr<protocol::ClipboardStub> client_clipboard) {
- ui::OzonePlatform* ozone_platform = ui::OzonePlatform::GetInstance();
- delegate_ = ozone_platform->CreateSystemInputInjector();
- DCHECK(delegate_);
- input_controller_ = ozone_platform->GetInputController();
- DCHECK(input_controller_);
-
- // Implemented by remoting::ClipboardAura.
clipboard_ = Clipboard::Create();
clipboard_->Start(client_clipboard.Pass());
point_transformer_.reset(new PointTransformer());
@@ -165,7 +164,9 @@
InputInjectorChromeos::InputInjectorChromeos(
scoped_refptr<base::SingleThreadTaskRunner> task_runner)
: input_task_runner_(task_runner) {
- core_.reset(new Core());
+ ui::OzonePlatform* ozone_platform = ui::OzonePlatform::GetInstance();
+ core_.reset(new Core(ozone_platform->CreateSystemInputInjector(),
+ ozone_platform->GetInputController()));
}
InputInjectorChromeos::~InputInjectorChromeos() {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698