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 7b30672750b3c9825fa49f30e12404f5140dc35b..8c4cf85d690d545d2fa9dd9e3da5723597200e45 100644 |
--- a/ui/views/mus/window_manager_connection.cc |
+++ b/ui/views/mus/window_manager_connection.cc |
@@ -4,6 +4,7 @@ |
#include "ui/views/mus/window_manager_connection.h" |
+#include <set> |
#include <utility> |
#include "base/lazy_instance.h" |
@@ -113,20 +114,20 @@ WindowManagerConnection::WindowManagerConnection( |
lazy_tls_ptr.Pointer()->Set(this); |
gpu_service_ = ui::GpuService::Create(connector, std::move(task_runner)); |
- compositor_context_factory_.reset( |
- new views::SurfaceContextFactory(gpu_service_.get())); |
+ compositor_context_factory_ = |
+ base::MakeUnique<views::SurfaceContextFactory>(gpu_service_.get()); |
aura::Env::GetInstance()->set_context_factory( |
compositor_context_factory_.get()); |
- client_.reset(new ui::WindowTreeClient(this, nullptr, nullptr)); |
+ client_ = base::MakeUnique<ui::WindowTreeClient>(this, nullptr, nullptr); |
client_->ConnectViaWindowTreeFactory(connector_); |
- pointer_watcher_event_router_.reset( |
- new PointerWatcherEventRouter(client_.get())); |
+ pointer_watcher_event_router_ = |
+ base::MakeUnique<PointerWatcherEventRouter>(client_.get()); |
- screen_.reset(new ScreenMus(this)); |
+ screen_ = base::MakeUnique<ScreenMus>(this); |
screen_->Init(connector); |
- std::unique_ptr<ClipboardMus> clipboard(new ClipboardMus); |
+ std::unique_ptr<ClipboardMus> clipboard = base::MakeUnique<ClipboardMus>(); |
clipboard->Init(connector); |
ui::Clipboard::SetClipboardForCurrentThread(std::move(clipboard)); |