Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(642)

Unified Diff: ui/views/mus/window_manager_connection.cc

Issue 2374883002: views/mus: Change 'reset(new' to base::MakeUnqiue. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/mus/views_mus_test_suite.cc ('k') | ui/views/mus/window_tree_host_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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));
« no previous file with comments | « ui/views/mus/views_mus_test_suite.cc ('k') | ui/views/mus/window_tree_host_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698