Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

ui/aura/env.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/env.h"
 
 #include "base/command_line.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/env_observer.h"
 #include "ui/aura/event_filter.h"
-#include "ui/aura/display_manager.h"
 #include "ui/aura/root_window_host.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/compositor.h"
 #include "ui/compositor/compositor_switches.h"
 
 #if defined(USE_X11)
 #include "base/message_pump_aurax11.h"
-#include "ui/aura/display_change_observer_x11.h"
 #endif
 
 namespace aura {
 
 // static
 Env* Env::instance_ = NULL;
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, public:
 
@@ skipping 52 matching lines @@
     if (is_cursor_hidden_)
       last_mouse_location_ = hidden_cursor_location_;
     is_cursor_hidden_ = false;
   } else {
     hidden_cursor_location_ = last_mouse_location_;
     last_mouse_location_ = gfx::Point(-10000, -10000);
     is_cursor_hidden_ = true;
   }
 }
 
-void Env::SetDisplayManager(DisplayManager* display_manager) {
-  display_manager_.reset(display_manager);
-#if defined(USE_X11)
-  // Update the display manager with latest info.
-  display_change_observer_->NotifyDisplayChange();
-#endif
-}
-
 #if !defined(OS_MACOSX)
 MessageLoop::Dispatcher* Env::GetDispatcher() {
 #if defined(USE_X11)
   return base::MessagePumpAuraX11::Current();
 #else
   return dispatcher_.get();
 #endif
 }
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, private:
 
 void Env::Init() {
 #if !defined(USE_X11)
   dispatcher_.reset(CreateDispatcher());
 #endif
 #if defined(USE_X11)
-  display_change_observer_.reset(new internal::DisplayChangeObserverX11);
-
   // We can't do this with a root window listener because XI_HierarchyChanged
   // messages don't have a target window.
   base::MessagePumpAuraX11::Current()->AddObserver(
       &device_list_updater_aurax11_);
 #endif
   ui::Compositor::Initialize(
       CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kUIEnableThreadedCompositing));
 }
 
 void Env::NotifyWindowInitialized(Window* window) {
   FOR_EACH_OBSERVER(EnvObserver, observers_, OnWindowInitialized(window));
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Env, ui::EventTarget implementation:
 
 bool Env::CanAcceptEvents() {
   return true;
 }
 
 ui::EventTarget* Env::GetParentTarget() {
   return NULL;
 }
 
 }  // namespace aura