Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ash/display/display_change_observer_x11.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 "ui/aura/display_change_observer_x11.h"
+#include "ash/display/display_change_observer_x11.h"
 
 #include <algorithm>
 #include <map>
 #include <set>
 #include <vector>
 
 #include <X11/extensions/Xrandr.h>
 
+#include "ash/display/display_manager.h"
+#include "ash/shell.h"
 #include "base/message_pump_aurax11.h"
-#include "ui/aura/env.h"
-#include "ui/aura/display_manager.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/compositor/dip_util.h"
 #include "ui/gfx/display.h"
 
-namespace aura {
+namespace ash {
 namespace internal {
 
 namespace {
 
 // The DPI threshold to detect high density screen.
 // Higher DPI than this will use device_scale_factor=2.
 // Note: This value has to be kept in sync with the mouse/touchpad driver
 // which controls mouse pointer acceleration. If you need to update this value,
 // please update the bug (crosbug.com/31628) first and make sure that the
 // driver will use the same value.
@@ skipping 60 matching lines @@
 }
 
 bool DisplayChangeObserverX11::Dispatch(const base::NativeEvent& event) {
   if (event->type - xrandr_event_base_ == RRScreenChangeNotify) {
     NotifyDisplayChange();
   }
   return true;
 }
 
 void DisplayChangeObserverX11::NotifyDisplayChange() {
-  if (!DisplayManager::use_fullscreen_host_window())
-    return;  // Use the default display that display manager determined.
-
   XRRScreenResources* screen_resources =
       XRRGetScreenResources(xdisplay_, x_root_window_);
   std::map<XID, XRRCrtcInfo*> crtc_info_map;
 
   for (int c = 0; c < screen_resources->ncrtc; c++) {
     XID crtc_id = screen_resources->crtcs[c];
     XRRCrtcInfo *crtc_info =
         XRRGetCrtcInfo(xdisplay_, screen_resources, crtc_id);
     crtc_info_map[crtc_id] = crtc_info;
   }
@@ skipping 63 matching lines @@
   // coordinates.
   std::sort(displays.begin(), displays.end(), CompareDisplayY);
   int64 id = 0;
   for (std::vector<gfx::Display>::iterator iter = displays.begin();
        iter != displays.end(); ++iter) {
     if (iter->id() == gfx::Display::kInvalidDisplayID) {
       iter->set_id(id);
       ++id;
     }
   }
-
-  Env::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays);
+  // DisplayManager can be null during the boot.
+  Shell::GetInstance()->display_manager()->OnNativeDisplaysChanged(displays);
 }
 
 }  // namespace internal
-}  // namespace aura
+}  // namespace ash