| Index: ui/keyboard/keyboard_controller.cc
|
| diff --git a/ui/keyboard/keyboard_controller.cc b/ui/keyboard/keyboard_controller.cc
|
| index e0912a72d1b8c9fdec50c2ded0d21086bd688b3e..d56eb1d74145744b71b24ee0c0c0e3be46340a3a 100644
|
| --- a/ui/keyboard/keyboard_controller.cc
|
| +++ b/ui/keyboard/keyboard_controller.cc
|
| @@ -96,9 +96,10 @@ class KeyboardWindowDelegate : public aura::WindowDelegate {
|
| void ToggleTouchEventLogging(bool enable) {
|
| #if defined(OS_CHROMEOS)
|
| #if defined(USE_OZONE)
|
| - ui::OzonePlatform::GetInstance()
|
| - ->GetInputController()
|
| - ->SetTouchEventLoggingEnabled(enable);
|
| + ui::InputController* controller =
|
| + ui::OzonePlatform::GetInstance()->GetInputController();
|
| + if (controller)
|
| + controller->SetTouchEventLoggingEnabled(enable);
|
| #elif defined(USE_X11)
|
| if (!base::SysInfo::IsRunningOnChromeOS())
|
| return;
|
|
|