Using WmDisplayObserver in ScreenPinningController.

ash/wm/screen_pinning_controller.cc

 // Copyright 2016 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/screen_pinning_controller.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/common/window_user_data.h"
 #include "ash/common/wm/container_finder.h"
 #include "ash/common/wm/window_dimmer.h"
 #include "ash/common/wm/window_state.h"
+#include "ash/common/wm_shell.h"
 #include "ash/common/wm_window.h"
-#include "ash/display/window_tree_host_manager.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/shell.h"
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/wm/core/window_util.h"
 
 namespace ash {
@@ skipping 114 matching lines @@
   void OnWindowDestroying(aura::Window* window) override {
     // Just in case. There is nothing we can do here.
     window->RemoveObserver(this);
   }
 
  private:
   ScreenPinningController* controller_;
   DISALLOW_COPY_AND_ASSIGN(SystemModalContainerWindowObserver);
 };
 
-ScreenPinningController::ScreenPinningController(
-    WindowTreeHostManager* window_tree_host_manager)
+ScreenPinningController::ScreenPinningController()
     : window_dimmers_(base::MakeUnique<WindowUserData<WindowDimmer>>()),
-      window_tree_host_manager_(window_tree_host_manager),
       pinned_container_window_observer_(
           base::MakeUnique<PinnedContainerWindowObserver>(this)),
       pinned_container_child_window_observer_(
           base::MakeUnique<PinnedContainerChildWindowObserver>(this)),
       system_modal_container_window_observer_(
           base::MakeUnique<SystemModalContainerWindowObserver>(this)),
       system_modal_container_child_window_observer_(
           base::MakeUnique<SystemModalContainerChildWindowObserver>(this)) {
-  window_tree_host_manager_->AddObserver(this);
+  WmShell::Get()->AddDisplayObserver(this);
 }
 
 ScreenPinningController::~ScreenPinningController() {
-  window_tree_host_manager_->RemoveObserver(this);
+  WmShell::Get()->RemoveDisplayObserver(this);
 }
 
 bool ScreenPinningController::IsPinned() const {
   return pinned_window_ != nullptr;
 }
 
 void ScreenPinningController::SetPinnedWindow(WmWindow* pinned_window) {
   window_dimmers_->clear();
 
   if (pinned_window->GetWindowState()->IsPinned()) {
@@ skipping 169 matching lines @@
     return;
 
   WindowDimmer* window_dimmer = window_dimmers_->Get(container);
   if (window_dimmer) {
     base::AutoReset<bool> auto_reset(&in_restacking_, true);
     container->StackChildAtBottom(window_dimmer->window());
   }
 }
 
 }  // namespace ash