Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

chrome/browser/ui/webui/options/chromeos/display_options_handler.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OPTIONS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OPTIONS_HANDLER_H_
 
 #include <vector>
 
 #include "chrome/browser/ui/webui/options/options_ui.h"
-#include "ui/aura/display_observer.h"
+#include "ui/gfx/display_observer.h"
 
 namespace base {
 class DictionaryValue;
 class ListValue;
 }
 
 namespace chromeos {
 class OverscanCalibrator;
 
 namespace options {
 
 // Display options overlay page UI handler.
 class DisplayOptionsHandler : public ::options::OptionsPageUIHandler,
-                              public aura::DisplayObserver {
+                              public gfx::DisplayObserver {
  public:
   DisplayOptionsHandler();
   virtual ~DisplayOptionsHandler();
 
   // OptionsPageUIHandler implementation.
   virtual void GetLocalizedValues(
       base::DictionaryValue* localized_strings) OVERRIDE;
   virtual void InitializePage() OVERRIDE;
 
   // WebUIMessageHandler implementation.
   virtual void RegisterMessages() OVERRIDE;
 
-  // aura::DisplayObserver implementation.
+  // gfx::DisplayObserver implementation.
   virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE;
   virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
   virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
 
  private:
   // Updates the display section visibility based on the current display
   // configurations.
   void UpdateDisplaySectionVisibility();
 
   // Sends the current display information to the web_ui of options page.
@@ skipping 20 matching lines @@
 
   scoped_ptr<OverscanCalibrator> overscan_calibrator_;
 
   DISALLOW_COPY_AND_ASSIGN(DisplayOptionsHandler);
 };
 
 }  // namespace options
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CHROMEOS_DISPLAY_OPTIONS_HANDLER_H_