| Index: chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
|
| diff --git a/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc b/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
|
| index c0ad7b67fdb38101dde0b3e21761ac0e67cc5ab1..7c6fa49dbe96cbed51af3d09468cdee201ba0fb5 100644
|
| --- a/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
|
| +++ b/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
|
| @@ -54,11 +54,16 @@ class InputDeviceSettingsImplOzone : public InputDeviceSettings {
|
| DISALLOW_COPY_AND_ASSIGN(InputDeviceSettingsImplOzone);
|
| };
|
|
|
| +ui::InputController* GetInputController() {
|
| + return // ui::OzonePlatform::GetInstance() ?
|
| + // ui::OzonePlatform::GetInstance()->GetInputController() :
|
| + ui::CreateStubInputController().release();
|
| +}
|
| +
|
| InputDeviceSettingsImplOzone::InputDeviceSettingsImplOzone()
|
| - : input_controller_(
|
| - ui::OzonePlatform::GetInstance()->GetInputController()) {
|
| + : input_controller_(GetInputController()) {
|
| // Make sure the input controller does exist.
|
| - DCHECK(ui::OzonePlatform::GetInstance()->GetInputController());
|
| + DCHECK(input_controller_);
|
| }
|
|
|
| void InputDeviceSettingsImplOzone::TouchpadExists(
|
|
|