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

Unified Diff: mash/screenlock/screenlock.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/screenlock/screenlock.cc
diff --git a/mash/screenlock/screenlock.cc b/mash/screenlock/screenlock.cc
index 87e6802f248108311550f324967fd26b1840b8f6..a488f56969175cc87df11a472c922a1c41b9247a 100644
--- a/mash/screenlock/screenlock.cc
+++ b/mash/screenlock/screenlock.cc
@@ -6,6 +6,7 @@
#include "ash/public/cpp/shell_window_ids.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/strings/utf_string_conversions.h"
#include "mash/session/public/interfaces/session.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
@@ -81,8 +82,8 @@ void Screenlock::OnStart(const service_manager::ServiceInfo& info) {
session->AddScreenlockStateListener(
bindings_.CreateInterfacePtrAndBind(this));
- aura_init_.reset(
- new views::AuraInit(connector(), "views_mus_resources.pak"));
+ aura_init_ = base::MakeUnique<views::AuraInit>(connector(), info.identity,
+ "views_mus_resources.pak");
window_manager_connection_ =
views::WindowManagerConnection::Create(connector(), info.identity);

Powered by Google App Engine
This is Rietveld 408576698