Chromium Code Reviews| Index: ui/aura/env.cc |
| diff --git a/ui/aura/env.cc b/ui/aura/env.cc |
| index e9ec9d79859d331f3f96cd9d9e51474c026fe812..be2ac8c141ca0b17170027040ee3d3e8e4865fa9 100644 |
| --- a/ui/aura/env.cc |
| +++ b/ui/aura/env.cc |
| @@ -13,6 +13,7 @@ |
| #include "ui/aura/env_observer.h" |
| #include "ui/aura/input_state_lookup.h" |
| #include "ui/aura/mus/mus_types.h" |
| +#include "ui/aura/mus/os_exchange_data_provider_mus.h" |
| #include "ui/aura/mus/window_port_mus.h" |
| #include "ui/aura/mus/window_tree_client.h" |
| #include "ui/aura/window.h" |
| @@ -192,8 +193,11 @@ Env::Env(Mode mode) |
| } |
| void Env::Init() { |
| - if (RunningInsideMus()) |
| + if (RunningInsideMus()) { |
| + ui::OSExchangeDataProviderFactory::SetFactory(this); |
|
sky
2017/03/10 21:00:57
Unset this in the destructor, which matters for te
Elliot Glaysher
2017/03/10 21:30:07
Done.
|
| return; |
| + } |
| + |
| #if defined(USE_OZONE) |
| // The ozone platform can provide its own event source. So initialize the |
| // platform before creating the default event source. If running inside mus |
| @@ -243,4 +247,8 @@ ui::EventTargeter* Env::GetEventTargeter() { |
| return NULL; |
| } |
| +std::unique_ptr<ui::OSExchangeData::Provider> Env::BuildProvider() { |
| + return base::MakeUnique<aura::OSExchangeDataProviderMus>(); |
| +} |
| + |
| } // namespace aura |