Move more from WmShell to Shell

ash/common/wm/maximize_mode/maximize_mode_event_handler.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/common/wm/maximize_mode/maximize_mode_event_handler.h"
 
 #include "ash/common/session/session_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
 #include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
+#include "ash/shell.h"
 #include "ui/events/event.h"
 
 namespace ash {
 namespace wm {
 namespace {
 
 // The height of the area in which a touch operation leads to exiting the
 // full screen mode.
 const int kLeaveFullScreenAreaHeightInPixel = 2;
 
@@ skipping 25 matching lines @@
 
   // Test that the touch happened in the top or bottom lines.
   int y = event.y();
   if (y >= kLeaveFullScreenAreaHeightInPixel &&
       y < (window->GetBounds().height() - kLeaveFullScreenAreaHeightInPixel)) {
     return false;
   }
 
   // Do not exit fullscreen in kiosk mode.
   SystemTrayDelegate* system_tray_delegate =
-      WmShell::Get()->system_tray_delegate();
+      Shell::Get()->system_tray_delegate();
   if (system_tray_delegate->GetUserLoginStatus() == LoginStatus::KIOSK_APP ||
       system_tray_delegate->GetUserLoginStatus() ==
           LoginStatus::ARC_KIOSK_APP) {
     return false;
   }
 
   WMEvent toggle_fullscreen(WM_EVENT_TOGGLE_FULLSCREEN);
   window->GetWindowState()->OnWMEvent(&toggle_fullscreen);
   return true;
 }
 
 }  // namespace wm
 }  // namespace ash