Moves maintaining ShellObservers back to Shell

ash/virtual_keyboard_controller.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/virtual_keyboard_controller.h"
 
 #include <vector>
 
 #include "ash/common/keyboard/keyboard_ui.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
@@ skipping 54 matching lines @@
   }
 }
 
 }  // namespace
 
 VirtualKeyboardController::VirtualKeyboardController()
     : has_external_keyboard_(false),
       has_internal_keyboard_(false),
       has_touchscreen_(false),
       ignore_external_keyboard_(false) {
-  WmShell::Get()->AddShellObserver(this);
+  Shell::GetInstance()->AddShellObserver(this);
   ui::InputDeviceManager::GetInstance()->AddObserver(this);
   UpdateDevices();
 }
 
 VirtualKeyboardController::~VirtualKeyboardController() {
-  WmShell::Get()->RemoveShellObserver(this);
+  Shell::GetInstance()->RemoveShellObserver(this);
   ui::InputDeviceManager::GetInstance()->RemoveObserver(this);
 }
 
 void VirtualKeyboardController::OnMaximizeModeStarted() {
   if (!IsSmartVirtualKeyboardEnabled()) {
     SetKeyboardEnabled(true);
   } else {
     UpdateKeyboardEnabled();
   }
   keyboard::SetOverscrollEnabledWithAccessibilityKeyboard(true);
@@ skipping 120 matching lines @@
   if (is_enabled == was_enabled)
     return;
   if (is_enabled) {
     Shell::GetInstance()->CreateKeyboard();
   } else {
     Shell::GetInstance()->DeactivateKeyboard();
   }
 }
 
 }  // namespace ash