mash: Migrate ShellDelegate ownership and access to WmShell.

ash/wm/lock_layout_manager.cc

 // Copyright 2014 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/wm/lock_layout_manager.h"
 
+#include "ash/common/shell_delegate.h"
 #include "ash/common/wm/window_state.h"
 #include "ash/common/wm/wm_event.h"
-#include "ash/shell.h"
-#include "ash/shell_delegate.h"
+#include "ash/common/wm_shell.h"
 #include "ash/wm/lock_window_state.h"
 #include "ash/wm/window_state_aura.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/events/event.h"
 #include "ui/keyboard/keyboard_controller.h"
 #include "ui/keyboard/keyboard_util.h"
 
 namespace ash {
 
 LockLayoutManager::LockLayoutManager(aura::Window* window)
     : SnapToPixelLayoutManager(window),
       window_(window),
       root_window_(window->GetRootWindow()),
       is_observing_keyboard_(false) {
-  Shell::GetInstance()->delegate()->AddVirtualKeyboardStateObserver(this);
+  WmShell::Get()->delegate()->AddVirtualKeyboardStateObserver(this);
   root_window_->AddObserver(this);
   if (keyboard::KeyboardController::GetInstance()) {
     keyboard::KeyboardController::GetInstance()->AddObserver(this);
     is_observing_keyboard_ = true;
   }
 }
 
 LockLayoutManager::~LockLayoutManager() {
   if (root_window_)
     root_window_->RemoveObserver(this);
 
   for (aura::Window::Windows::const_iterator it = window_->children().begin();
        it != window_->children().end(); ++it) {
     (*it)->RemoveObserver(this);
   }
 
-  Shell::GetInstance()->delegate()->RemoveVirtualKeyboardStateObserver(this);
+  WmShell::Get()->delegate()->RemoveVirtualKeyboardStateObserver(this);
 
   if (keyboard::KeyboardController::GetInstance() && is_observing_keyboard_) {
     keyboard::KeyboardController::GetInstance()->RemoveObserver(this);
     is_observing_keyboard_ = false;
   }
 }
 
 void LockLayoutManager::OnWindowResized() {
   const wm::WMEvent event(wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED);
   AdjustWindowsForWorkAreaChange(&event);
@@ skipping 72 matching lines @@
   DCHECK(event->type() == wm::WM_EVENT_DISPLAY_BOUNDS_CHANGED ||
          event->type() == wm::WM_EVENT_WORKAREA_BOUNDS_CHANGED);
 
   for (aura::Window::Windows::const_iterator it = window_->children().begin();
        it != window_->children().end(); ++it) {
     wm::GetWindowState(*it)->OnWMEvent(event);
   }
 }
 
 }  // namespace ash