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

Unified Diff: mash/login/login.cc

Issue 2471033005: Adds DesktopWindowTreeHostMus (Closed)
Patch Set: fix Created 4 years, 1 month 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
Index: mash/login/login.cc
diff --git a/mash/login/login.cc b/mash/login/login.cc
index 6565aa609c468cb8b758cbea4f536fa067f2664f..b99a6877941392f270292855ce7da5c3a0d21016 100644
--- a/mash/login/login.cc
+++ b/mash/login/login.cc
@@ -10,6 +10,7 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "base/guid.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/utf_string_conversions.h"
#include "mash/init/public/interfaces/init.mojom.h"
@@ -150,8 +151,8 @@ class Login : public service_manager::Service,
identity_ = info.identity;
tracing_.Initialize(connector(), identity_.name());
- aura_init_.reset(
- new views::AuraInit(connector(), "views_mus_resources.pak"));
+ aura_init_ = base::MakeUnique<views::AuraInit>(connector(), info.identity,
+ "views_mus_resources.pak");
connector()->ConnectToInterface("service:ui", &user_access_manager_);
user_access_manager_->SetActiveUser(identity_.user_id());

Powered by Google App Engine
This is Rietveld 408576698