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

Unified Diff: mash/quick_launch/quick_launch.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/quick_launch/quick_launch.cc
diff --git a/mash/quick_launch/quick_launch.cc b/mash/quick_launch/quick_launch.cc
index 4e22b145c635e67d3b8914da1ee820d209eb3ca2..e5e5e4cea2142771b119957e0a9fd003c95f90c6 100644
--- a/mash/quick_launch/quick_launch.cc
+++ b/mash/quick_launch/quick_launch.cc
@@ -5,6 +5,7 @@
#include "mash/quick_launch/quick_launch.h"
#include "base/macros.h"
+#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/strings/string16.h"
#include "base/strings/string_util.h"
@@ -166,8 +167,8 @@ void QuickLaunch::RemoveWindow(views::Widget* window) {
void QuickLaunch::OnStart(const service_manager::ServiceInfo& info) {
tracing_.Initialize(connector(), info.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");
window_manager_connection_ =
views::WindowManagerConnection::Create(connector(), info.identity);
« no previous file with comments | « mash/login/login.cc ('k') | mash/screenlock/screenlock.cc » ('j') | ui/views/mus/aura_init.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698