| Index: ash/mus/sysui_application.cc
|
| diff --git a/ash/mus/sysui_application.cc b/ash/mus/sysui_application.cc
|
| index 571523ef93c0a7b35eaed001462f20c47de34e91..7ab4a3c6fc5af9eed4ea224494d2cf50ac0eda5e 100644
|
| --- a/ash/mus/sysui_application.cc
|
| +++ b/ash/mus/sysui_application.cc
|
| @@ -193,10 +193,11 @@ class AshInit {
|
|
|
| aura::Window* root() { return ash::Shell::GetPrimaryRootWindow(); }
|
|
|
| - void Initialize(::shell::Connector* connector) {
|
| + void Initialize(::shell::Connector* connector,
|
| + const ::shell::Identity& identity) {
|
| InitializeResourceBundle(connector);
|
| aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
|
| - views::WindowManagerConnection::Create(connector);
|
| + views::WindowManagerConnection::Create(connector, identity);
|
|
|
| gfx::Screen* screen = gfx::Screen::GetScreen();
|
| DCHECK(screen);
|
| @@ -306,7 +307,7 @@ void SysUIApplication::Initialize(::shell::Connector* connector,
|
| const ::shell::Identity& identity,
|
| uint32_t id) {
|
| ash_init_.reset(new AshInit());
|
| - ash_init_->Initialize(connector);
|
| + ash_init_->Initialize(connector, identity);
|
| }
|
|
|
| bool SysUIApplication::AcceptConnection(::shell::Connection* connection) {
|
|
|