| Index: ui/aura/env.h
|
| diff --git a/ui/aura/env.h b/ui/aura/env.h
|
| index f843ca05ff1bc3979b5d2867ef6802eb429d864d..b6b1b2c04c8ed57c0ab3f3ad470c21de20552c5f 100644
|
| --- a/ui/aura/env.h
|
| +++ b/ui/aura/env.h
|
| @@ -11,6 +11,7 @@
|
| #include "base/observer_list.h"
|
| #include "base/supports_user_data.h"
|
| #include "ui/aura/aura_export.h"
|
| +#include "ui/base/dragdrop/os_exchange_data_provider_factory.h"
|
| #include "ui/events/event_handler.h"
|
| #include "ui/events/event_target.h"
|
| #include "ui/gfx/geometry/point.h"
|
| @@ -39,7 +40,9 @@ class WindowTreeClient;
|
| class WindowTreeHost;
|
|
|
| // A singleton object that tracks general state within Aura.
|
| -class AURA_EXPORT Env : public ui::EventTarget, public base::SupportsUserData {
|
| +class AURA_EXPORT Env : public ui::EventTarget,
|
| + public ui::OSExchangeDataProviderFactory::Factory,
|
| + public base::SupportsUserData {
|
| public:
|
| enum class Mode {
|
| // Classic aura.
|
| @@ -138,6 +141,9 @@ class AURA_EXPORT Env : public ui::EventTarget, public base::SupportsUserData {
|
| std::unique_ptr<ui::EventTargetIterator> GetChildIterator() const override;
|
| ui::EventTargeter* GetEventTargeter() override;
|
|
|
| + // Overridden from ui::OSExchangeDataProviderFactory::Factory:
|
| + std::unique_ptr<ui::OSExchangeData::Provider> BuildProvider() override;
|
| +
|
| // This is not const for tests, which may share Env across tests and so needs
|
| // to reset the value.
|
| Mode mode_;
|
|
|