Moves maintaining ShellObservers back to Shell

ash/system/chromeos/rotation/tray_rotation_lock.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/system/chromeos/rotation/tray_rotation_lock.h"
 
 #include "ash/common/system/tray/actionable_view.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
@@ skipping 75 matching lines @@
 
   tri_view->AddView(TriView::Container::START, icon_);
   tri_view->AddView(TriView::Container::CENTER, label_);
   tri_view->SetContainerVisible(TriView::Container::END, false);
 
   Update();
 
   SetInkDropMode(InkDropHostView::InkDropMode::ON);
 
   SetVisible(IsMaximizeModeWindowManagerEnabled());
-  WmShell::Get()->AddShellObserver(this);
+  Shell::GetInstance()->AddShellObserver(this);
   if (IsMaximizeModeWindowManagerEnabled())
     Shell::GetInstance()->screen_orientation_controller()->AddObserver(this);
 }
 
 RotationLockDefaultView::~RotationLockDefaultView() {
   StopObservingRotation();
-  WmShell::Get()->RemoveShellObserver(this);
+  Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 void RotationLockDefaultView::Update() {
   TrayPopupItemStyle style(TrayPopupItemStyle::FontStyle::DEFAULT_VIEW_LABEL);
   icon_->SetImage(gfx::CreateVectorIcon(IsRotationLocked()
                                             ? kSystemMenuRotationLockLockedIcon
                                             : kSystemMenuRotationLockAutoIcon,
                                         kMenuIconSize, style.GetIconColor()));
 
   base::string16 label = l10n_util::GetStringUTF16(
@@ skipping 39 matching lines @@
 void RotationLockDefaultView::OnRotationLockChanged(bool rotation_locked) {
   Update();
 }
 
 }  // namespace tray
 
 TrayRotationLock::TrayRotationLock(SystemTray* system_tray)
     : TrayImageItem(system_tray,
                     kSystemTrayRotationLockLockedIcon,
                     UMA_ROTATION_LOCK) {
-  WmShell::Get()->AddShellObserver(this);
+  Shell::GetInstance()->AddShellObserver(this);
 }
 
 TrayRotationLock::~TrayRotationLock() {
-  WmShell::Get()->RemoveShellObserver(this);
+  Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 void TrayRotationLock::OnRotationLockChanged(bool rotation_locked) {
   tray_view()->SetVisible(ShouldBeVisible());
 }
 
 views::View* TrayRotationLock::CreateDefaultView(LoginStatus status) {
   if (OnPrimaryDisplay())
     return new tray::RotationLockDefaultView(this);
   return nullptr;
 }
 
 void TrayRotationLock::OnMaximizeModeStarted() {
   tray_view()->SetVisible(IsRotationLocked());
   Shell::GetInstance()->screen_orientation_controller()->AddObserver(this);
 }
 
 void TrayRotationLock::OnMaximizeModeEnded() {
   tray_view()->SetVisible(false);
   StopObservingRotation();
 }
 
 void TrayRotationLock::DestroyTrayView() {
   StopObservingRotation();
-  WmShell::Get()->RemoveShellObserver(this);
+  Shell::GetInstance()->RemoveShellObserver(this);
   TrayImageItem::DestroyTrayView();
 }
 
 bool TrayRotationLock::GetInitialVisibility() {
   return ShouldBeVisible();
 }
 
 bool TrayRotationLock::ShouldBeVisible() {
   return OnPrimaryDisplay() && IsMaximizeModeWindowManagerEnabled() &&
          IsRotationLocked();
 }
 
 bool TrayRotationLock::OnPrimaryDisplay() const {
   gfx::NativeView native_view = system_tray()->GetWidget()->GetNativeView();
   display::Display parent_display =
       display::Screen::GetScreen()->GetDisplayNearestWindow(native_view);
   return parent_display.IsInternal();
 }
 
 void TrayRotationLock::StopObservingRotation() {
   ScreenOrientationController* controller =
       Shell::GetInstance()->screen_orientation_controller();
   if (controller)
     controller->RemoveObserver(this);
 }
 
 }  // namespace ash