| Index: ash/touch_hud/mus/touch_hud_application.cc
|
| diff --git a/ash/touch_hud/mus/touch_hud_application.cc b/ash/touch_hud/mus/touch_hud_application.cc
|
| index 1968bf05433033b0fc4a26972fda8323fd9d5d73..1bd908bc546dc490392c7d1400dad5fe39a93776 100644
|
| --- a/ash/touch_hud/mus/touch_hud_application.cc
|
| +++ b/ash/touch_hud/mus/touch_hud_application.cc
|
| @@ -7,6 +7,7 @@
|
| #include "ash/public/cpp/shell_window_ids.h"
|
| #include "ash/touch_hud/touch_hud_renderer.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "services/service_manager/public/cpp/connector.h"
|
| #include "services/ui/public/cpp/property_type_converters.h"
|
| @@ -65,7 +66,8 @@ TouchHudApplication::TouchHudApplication() : binding_(this) {}
|
| TouchHudApplication::~TouchHudApplication() {}
|
|
|
| void TouchHudApplication::OnStart(const service_manager::ServiceInfo& info) {
|
| - 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);
|
| }
|
|
|