remoting: removes SystemInputInjectorFactory (take 2)
This removes SystemInputInjectorFactory and goes back to using OzonePlatform
for creation. Additionally this moves SystemInputInjector back to ozone as
that is the only place that exposes it.
This effectively undoes moving we did for mash, which is no more.
BUG=958233
TEST=none
[email protected],[email protected]
Change-Id: I9d70a6720cc5d03c69332106ccfc4ea61c66b991
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1669657
Reviewed-by: Scott Violet <[email protected]>
Reviewed-by: Joe Downing <[email protected]>
Reviewed-by: Robert Kroeger <[email protected]>
Commit-Queue: Scott Violet <[email protected]>
Cr-Commit-Position: refs/heads/master@{#671073}
diff --git a/remoting/host/basic_desktop_environment.h b/remoting/host/basic_desktop_environment.h
index 1c6f8e2..bb2e60d 100644
--- a/remoting/host/basic_desktop_environment.h
+++ b/remoting/host/basic_desktop_environment.h
@@ -18,10 +18,6 @@
class SingleThreadTaskRunner;
}
-namespace ui {
-class SystemInputInjectorFactory;
-}
-
namespace webrtc {
class DesktopCaptureOptions;
@@ -57,7 +53,6 @@
scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
- ui::SystemInputInjectorFactory* system_input_injector_factory,
base::WeakPtr<ClientSessionControl> client_session_control,
const DesktopEnvironmentOptions& options);
@@ -86,10 +81,6 @@
return *options_.desktop_capture_options();
}
- ui::SystemInputInjectorFactory* system_input_injector_factory() const {
- return system_input_injector_factory_;
- }
-
const DesktopEnvironmentOptions& desktop_environment_options() const {
return options_;
}
@@ -108,9 +99,6 @@
// Used to run UI code.
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
- // Passed to InputInjector.
- ui::SystemInputInjectorFactory* system_input_injector_factory_;
-
// Used to send messages directly to the client session.
base::WeakPtr<ClientSessionControl> client_session_control_;
@@ -126,8 +114,7 @@
scoped_refptr<base::SingleThreadTaskRunner> caller_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> video_capture_task_runner,
scoped_refptr<base::SingleThreadTaskRunner> input_task_runner,
- scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner,
- ui::SystemInputInjectorFactory* system_input_injector_factory);
+ scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner);
~BasicDesktopEnvironmentFactory() override;
// DesktopEnvironmentFactory implementation.
@@ -151,10 +138,6 @@
return ui_task_runner_;
}
- ui::SystemInputInjectorFactory* system_input_injector_factory() const {
- return system_input_injector_factory_;
- }
-
private:
// Task runner on which methods of DesktopEnvironmentFactory interface should
// be called.
@@ -169,9 +152,6 @@
// Used to run UI code.
scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
- // Passed to the environments built.
- ui::SystemInputInjectorFactory* system_input_injector_factory_;
-
DISALLOW_COPY_AND_ASSIGN(BasicDesktopEnvironmentFactory);
};
