| Index: ui/views/mus/window_manager_connection.cc
|
| diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc
|
| index e6280123a8e1d489bc6fcdba777f3c5bacfb0b0a..d924fc88fa5cbd6ad71de37ffb308abe48e71f62 100644
|
| --- a/ui/views/mus/window_manager_connection.cc
|
| +++ b/ui/views/mus/window_manager_connection.cc
|
| @@ -18,6 +18,7 @@
|
| #include "services/shell/public/cpp/connector.h"
|
| #include "ui/events/devices/device_data_manager.h"
|
| #include "ui/gfx/geometry/mojo/geometry_type_converters.h"
|
| +#include "ui/views/mus/clipboard_mus.h"
|
| #include "ui/views/mus/native_widget_mus.h"
|
| #include "ui/views/mus/screen_mus.h"
|
| #include "ui/views/pointer_watcher.h"
|
| @@ -110,6 +111,11 @@ WindowManagerConnection::WindowManagerConnection(
|
| screen_.reset(new ScreenMus(this));
|
| screen_->Init(connector);
|
|
|
| + // We keep a weak ptr to clipboard_
|
| + std::unique_ptr<ClipboardMus> clipboard(new ClipboardMus);
|
| + clipboard->Init(connector);
|
| + ui::Clipboard::SetClipboardForCurrentThread(std::move(clipboard));
|
| +
|
| // TODO(sad): We should have a DeviceDataManager implementation that talks to
|
| // a mojo service to learn about the input-devices on the system.
|
| // http://crbug.com/601981
|
| @@ -126,6 +132,8 @@ WindowManagerConnection::~WindowManagerConnection() {
|
| // destroy it while we are still valid.
|
| window_tree_connection_.reset();
|
|
|
| + ui::Clipboard::DestroyClipboardForCurrentThread();
|
| +
|
| ui::DeviceDataManager::DeleteInstance();
|
| }
|
|
|
|
|