- Move DisplayManager and DisplayChangeObserverX11 from aura

  to ash.DisplayManager/DisplayChangeObserverX11 are in aura for
  historical reason, but they no longer have to be in aura.
  * Remove SingleDisplayManager as it's no longer necessary.
  * Rename MultipleDisplayManager and consolidate into DisplayManager.
  * Remove DisplayManager from desktop environment. Screen
    information is managed by platform in desktop environment, and
    should be provided via gfx::Screen implementation.

- Move DisplayObserver to ui/gfx. This should be consolicated
  with other similar features such as WorkAreaWatcherObserver/
  DisplaySettingsProvider. It's tracked in crbug.com/122863.

- Misc cleanups
  * Test should use test_support_ash instead of including
    individual files.
  * Use TestScreen where appropriate.

BUG=159710, 122863
TEST=none

Review URL: https://chromiumcodereview.appspot.com/11363124

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167639 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 0 deletions

diff --git a/ui/gfx/screen_win.cc b/ui/gfx/screen_win.cc
index 072f47a..9b33c6b 100644
--- a/ui/gfx/screen_win.cc
+++ b/ui/gfx/screen_win.cc
@@ -90,6 +90,14 @@ gfx::Display ScreenWin::GetPrimaryDisplay() const {
   return display;
 }
 
+void ScreenWin::AddObserver(DisplayObserver* observer) {
+  // TODO(oshima): crbug.com/122863.
+}
+
+void ScreenWin::RemoveObserver(DisplayObserver* observer) {
+  // TODO(oshima): crbug.com/122863.
+}
+
 HWND ScreenWin::GetHWNDFromNativeView(NativeView window) const {
 #if defined(USE_AURA)
   NOTREACHED();