| commit | 17a617201df7af36c16348093ec1cb658c5bf7d0 | [log] [tgz] |
|---|---|---|
| author | Scott Violet <[email protected]> | Mon Jun 19 17:54:31 2017 |
| committer | Commit Bot <[email protected]> | Mon Jun 19 19:30:11 2017 |
| tree | 2c8245133166080d4a199fca247c22a0bbe7e32d | |
| parent | 6f9eaa1caf317bb313aa5d1a1b1f81200fed7cad [diff] |
chromeos: converts usage of ui::InputController to ui::InputDeviceController. InputDeviceController talks via a mojom to InputController, so that this works in all configs. This is made complicated by the touchpad disable code becoming async. BUG=642863 TEST=none Change-Id: Icafae97564c4f984453cd95085654ddcaf0b6e73 Reviewed-on: https://chromium-review.googlesource.com/530189 Reviewed-by: James Cook <[email protected]> Commit-Queue: Scott Violet <[email protected]> Cr-Commit-Position: refs/heads/master@{#480518}
diff --git a/ash/shell/shell_delegate_impl.cc b/ash/shell/shell_delegate_impl.cc index 81001e1a..19aa9fb 100644 --- a/ash/shell/shell_delegate_impl.cc +++ b/ash/shell/shell_delegate_impl.cc
@@ -155,5 +155,12 @@ void ShellDelegateImpl::UpdateTouchscreenStatusFromPrefs() {} +#if defined(USE_OZONE) +ui::InputDeviceControllerClient* +ShellDelegateImpl::GetInputDeviceControllerClient() { + return nullptr; +} +#endif + } // namespace shell } // namespace ash
diff --git a/ash/shell/shell_delegate_impl.h b/ash/shell/shell_delegate_impl.h index 0074e50c..477b927 100644 --- a/ash/shell/shell_delegate_impl.h +++ b/ash/shell/shell_delegate_impl.h
@@ -51,6 +51,9 @@ void SetTouchscreenEnabledInPrefs(bool enabled, bool use_local_state) override; void UpdateTouchscreenStatusFromPrefs() override; +#if defined(USE_OZONE) + ui::InputDeviceControllerClient* GetInputDeviceControllerClient() override; +#endif private: DISALLOW_COPY_AND_ASSIGN(ShellDelegateImpl);