Moves Shell::maximize_mode_controller() 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 79 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateStub);
 };
 
 }  // namespace
 
 WmShellMus::WmShellMus(::mus::WindowTreeClient* client)
     : client_(client), session_state_delegate_(new SessionStateDelegateStub) {
   client_->AddObserver(this);
   WmShell::Set(this);
 
+  CreateMaximizeModeController();
+
   CreateMruWindowTracker();
 
   accessibility_delegate_.reset(new DefaultAccessibilityDelegate);
   SetSystemTrayDelegate(base::WrapUnique(new DefaultSystemTrayDelegate));
 }
 
 WmShellMus::~WmShellMus() {
+  // This order mirrors that of Shell.
+
+  // Destroy maximize mode controller early on since it has some observers which
+  // need to be removed.
+  DeleteMaximizeModeController();
   DeleteSystemTrayDelegate();
   DeleteWindowSelectorController();
   DeleteMruWindowTracker();
   RemoveClientObserver();
   WmShell::Set(nullptr);
 }
 
 // static
 WmShellMus* WmShellMus::Get() {
   return static_cast<WmShellMus*>(WmShell::Get());
@@ skipping 204 matching lines @@
                     OnWindowActivated(gained_active, lost_active));
 }
 
 void WmShellMus::OnWillDestroyClient(::mus::WindowTreeClient* client) {
   DCHECK_EQ(client, client_);
   RemoveClientObserver();
 }
 
 }  // namespace mus
 }  // namespace ash