Moves maintaining ShellObservers back to Shell

chrome/browser/chromeos/policy/display_rotation_default_handler.cc

 // Copyright 2015 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/chromeos/policy/display_rotation_default_handler.h"
 
 #include <stddef.h>
 
-#include "ash/common/wm_shell.h"
 #include "ash/shell.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chromeos/settings/cros_settings_names.h"
 #include "ui/display/manager/display_manager.h"
 
 namespace policy {
 
 DisplayRotationDefaultHandler::DisplayRotationDefaultHandler() {
   ash::Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
-  ash::WmShell::Get()->AddShellObserver(this);
+  ash::Shell::GetInstance()->AddShellObserver(this);
   settings_observer_ = chromeos::CrosSettings::Get()->AddSettingsObserver(
       chromeos::kDisplayRotationDefault,
       base::Bind(&DisplayRotationDefaultHandler::OnCrosSettingsChanged,
                  base::Unretained(this)));
 }
 
 DisplayRotationDefaultHandler::~DisplayRotationDefaultHandler() {
 }
 
 void DisplayRotationDefaultHandler::OnShellInitialized() {
   UpdateFromCrosSettings();
   RotateDisplays();
 }
 
 void DisplayRotationDefaultHandler::OnDisplayConfigurationChanged() {
   RotateDisplays();
 }
 
 void DisplayRotationDefaultHandler::OnWindowTreeHostManagerShutdown() {
   ash::Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
-  ash::WmShell::Get()->RemoveShellObserver(this);
+  ash::Shell::GetInstance()->RemoveShellObserver(this);
   settings_observer_.reset();
   base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this);
 }
 
 void DisplayRotationDefaultHandler::OnCrosSettingsChanged() {
   if (!UpdateFromCrosSettings())
     return;
   // Policy changed, so reset all displays.
   rotated_displays_.clear();
   RotateDisplays();
@@ skipping 46 matching lines @@
       (new_policy_enabled &&
        new_display_rotation_default != display_rotation_default_)) {
     policy_enabled_ = new_policy_enabled;
     display_rotation_default_ = new_display_rotation_default;
     return true;
   }
   return false;
 }
 
 }  // namespace policy