mash: Migrate ShellDelegate ownership and access to WmShell.

ash/mus/bridge/wm_shell_mus.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/mus/bridge/wm_shell_mus.h"
 
 #include "ash/common/default_accessibility_delegate.h"
 #include "ash/common/display/display_info.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/shell_observer.h"
@@ skipping 74 matching lines @@
   bool screen_locked_;
 
   // A pseudo user info.
   std::unique_ptr<user_manager::UserInfo> user_info_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };
 
 }  // namespace
 
-WmShellMus::WmShellMus(::ui::WindowTreeClient* client)
-    : client_(client), session_state_delegate_(new SessionStateDelegateStub) {
+WmShellMus::WmShellMus(ShellDelegate* delegate, ::ui::WindowTreeClient* client)
+    : WmShell(delegate),
+      client_(client),
+      session_state_delegate_(new SessionStateDelegateStub) {
   client_->AddObserver(this);
   WmShell::Set(this);
 
   CreateMruWindowTracker();
 
   accessibility_delegate_.reset(new DefaultAccessibilityDelegate);
   SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate));
 }
 
 WmShellMus::~WmShellMus() {
@@ skipping 216 matching lines @@
                     OnWindowActivated(gained_active, lost_active));
 }
 
 void WmShellMus::OnDidDestroyClient(::ui::WindowTreeClient* client) {
   DCHECK_EQ(client, client_);
   RemoveClientObserver();
 }
 
 }  // namespace mus
 }  // namespace ash