Moves maintaining ShellObservers back to Shell

chrome/browser/notifications/login_state_notification_blocker_chromeos.cc

 // Copyright 2013 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 "chrome/browser/notifications/login_state_notification_blocker_chromeos.h"
 
 #include "ash/common/system/system_notifier.h"
-#include "ash/common/wm_shell.h"
 #include "ash/root_window_controller.h"
+#include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/message_center/message_center.h"
 
 LoginStateNotificationBlockerChromeOS::LoginStateNotificationBlockerChromeOS(
     message_center::MessageCenter* message_center)
     : NotificationBlocker(message_center),
       locked_(false),
       observing_(true) {
   // This class is created in the ctor of NotificationUIManager which is created
   // when a notification is created, so ash::Shell should be initialized, except
   // when running as a mus client (ash::Shell is not initialized when that is
   // the case).
-  if (ash::WmShell::HasInstance())
-    ash::WmShell::Get()->AddShellObserver(this);
+  if (ash::Shell::HasInstance())
+    ash::Shell::GetInstance()->AddShellObserver(this);
 
   // LoginState may not exist in some tests.
   if (chromeos::LoginState::IsInitialized())
     chromeos::LoginState::Get()->AddObserver(this);
   chromeos::UserAddingScreen::Get()->AddObserver(this);
 }
 
 LoginStateNotificationBlockerChromeOS::
     ~LoginStateNotificationBlockerChromeOS() {
   // In some tests, the notification blockers may be removed without calling
   // OnAppTerminating().
   if (chromeos::LoginState::IsInitialized())
     chromeos::LoginState::Get()->RemoveObserver(this);
   if (observing_) {
-    if (ash::WmShell::HasInstance())
-      ash::WmShell::Get()->RemoveShellObserver(this);
+    if (ash::Shell::HasInstance())
+      ash::Shell::GetInstance()->RemoveShellObserver(this);
     chromeos::UserAddingScreen::Get()->RemoveObserver(this);
   }
 }
 
 bool LoginStateNotificationBlockerChromeOS::ShouldShowNotificationAsPopup(
     const message_center::Notification& notification) const {
   if (ash::system_notifier::ShouldAlwaysShowPopups(notification.notifier_id()))
     return true;
 
   if (locked_)
     return false;
 
   if (chromeos::UserAddingScreen::Get()->IsRunning())
     return false;
 
   if (chromeos::LoginState::IsInitialized())
     return chromeos::LoginState::Get()->IsUserLoggedIn();
 
   return true;
 }
 
 void LoginStateNotificationBlockerChromeOS::OnLockStateChanged(bool locked) {
   locked_ = locked;
   NotifyBlockingStateChanged();
 }
 
 void LoginStateNotificationBlockerChromeOS::OnAppTerminating() {
-  if (ash::WmShell::HasInstance())
-    ash::WmShell::Get()->RemoveShellObserver(this);
+  if (ash::Shell::HasInstance())
+    ash::Shell::GetInstance()->RemoveShellObserver(this);
   chromeos::UserAddingScreen::Get()->RemoveObserver(this);
   observing_ = false;
 }
 
 void LoginStateNotificationBlockerChromeOS::LoggedInStateChanged() {
   NotifyBlockingStateChanged();
 }
 
 void LoginStateNotificationBlockerChromeOS::OnUserAddingStarted() {
   NotifyBlockingStateChanged();
 }
 
 void LoginStateNotificationBlockerChromeOS::OnUserAddingFinished() {
   NotifyBlockingStateChanged();
 }