Rename the remaining usage of Monitor to Display

ash/wm/stacking_controller.cc

 // Copyright (c) 2012 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/stacking_controller.h"
 
-#include "ash/monitor/monitor_controller.h"
+#include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/always_on_top_controller.h"
 #include "ash/wm/window_properties.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
 
 namespace ash {
 namespace internal {
 namespace {
 
 // Find a root window that matches the |bounds|. If the virtual screen
 // coordinates is enabled and the bounds is specified, the root window
 // that matches the window's bound will be used. Otherwise, it'll
 // return the active root window.
 aura::RootWindow* FindContainerRoot(const gfx::Rect& bounds) {
-  if (!MonitorController::IsVirtualScreenCoordinatesEnabled() ||
+  if (!DisplayController::IsVirtualScreenCoordinatesEnabled() ||
       (bounds.origin().x() == 0 && bounds.origin().y() == 0
        && bounds.IsEmpty())) {
     return Shell::GetActiveRootWindow();
   }
   return Shell::GetRootWindowMatching(bounds);
 }
 
 aura::Window* GetContainerById(const gfx::Rect& bounds, int id) {
   return Shell::GetContainer(FindContainerRoot(bounds), id);
 }
@@ skipping 104 matching lines @@
         root_window->GetChildById(
             internal::kShellWindowId_AlwaysOnTopContainer));
     // RootWindow owns the AlwaysOnTopController object.
     root_window->SetProperty(kAlwaysOnTopControllerKey, controller);
   }
   return controller;
 }
 
 }  // namespace internal
 }  // namespace ash