| Index: ui/aura/env.cc
|
| diff --git a/ui/aura/env.cc b/ui/aura/env.cc
|
| index 7e82d4e13cdba8de340959236efcea0cff0e1c4d..77b19e8fe133b36aa343ac61914d113731ee06cb 100644
|
| --- a/ui/aura/env.cc
|
| +++ b/ui/aura/env.cc
|
| @@ -9,6 +9,7 @@
|
| #include "base/threading/thread_local.h"
|
| #include "ui/aura/env_observer.h"
|
| #include "ui/aura/input_state_lookup.h"
|
| +#include "ui/events/devices/device_data_manager.h"
|
| #include "ui/events/event_target_iterator.h"
|
| #include "ui/events/platform/platform_event_source.h"
|
|
|
| @@ -99,8 +100,11 @@ void Env::Init(bool create_event_source) {
|
| // The ozone platform can provide its own event source. So initialize the
|
| // platform before creating the default event source. If running inside mus
|
| // let the mus process initialize ozone instead.
|
| - if (!RunningInsideMus())
|
| + if (!RunningInsideMus()) {
|
| ui::OzonePlatform::InitializeForUI();
|
| + } else {
|
| + ui::DeviceDataManager::CreateInstance();
|
| + }
|
| #endif
|
| if (!ui::PlatformEventSource::GetInstance())
|
| event_source_ = ui::PlatformEventSource::CreateDefault();
|
|
|