Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

- 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

Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=167639

[oshima, 2012-11-07 18:43:57]

ananta, can you test this on windows?

[oshima, 2012-11-09 18:20:30]

It's ready for review. Please take a look.

[ananta, 2012-11-09 18:39:51]

LGTM % nits

http://codereview.chromium.org/11363124/diff/7005/ash/display/display_manager.h
File ash/display/display_manager.h (right):

http://codereview.chromium.org/11363124/diff/7005/ash/display/display_manager...
ash/display/display_manager.h:74: // Rjegisters the overscan insets for the
display of the specified ID. Note
Registers

http://codereview.chromium.org/11363124/diff/7005/ui/aura/display_util.cc
File ui/aura/display_util.cc (right):

http://codereview.chromium.org/11363124/diff/7005/ui/aura/display_util.cc#new...
ui/aura/display_util.cc:15: bool use_fullscreen_host_window = false;
Should this be prefixed with g_?

http://codereview.chromium.org/11363124/diff/7005/ui/aura/test/aura_test_help...
File ui/aura/test/aura_test_helper.cc (right):

http://codereview.chromium.org/11363124/diff/7005/ui/aura/test/aura_test_help...
ui/aura/test/aura_test_helper.cc:47:
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
This four line pattern has been repeated multiple times. Would it make sense to
move this to a static helper in TestScreen?

[oshima, 2012-11-09 18:53:48]

http://codereview.chromium.org/11363124/diff/7005/ash/display/display_manager.h
File ash/display/display_manager.h (right):

http://codereview.chromium.org/11363124/diff/7005/ash/display/display_manager...
ash/display/display_manager.h:74: // Rjegisters the overscan insets for the
display of the specified ID. Note
On 2012/11/09 18:39:51, ananta wrote:
> Registers

Done.

http://codereview.chromium.org/11363124/diff/7005/ui/aura/display_util.cc
File ui/aura/display_util.cc (right):

http://codereview.chromium.org/11363124/diff/7005/ui/aura/display_util.cc#new...
ui/aura/display_util.cc:15: bool use_fullscreen_host_window = false;
On 2012/11/09 18:39:51, ananta wrote:
> Should this be prefixed with g_?

g_ is for global that can be accessed from other files.

http://codereview.chromium.org/11363124/diff/7005/ui/aura/test/aura_test_help...
File ui/aura/test/aura_test_helper.cc (right):

http://codereview.chromium.org/11363124/diff/7005/ui/aura/test/aura_test_help...
ui/aura/test/aura_test_helper.cc:47:
gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, test_screen_.get());
On 2012/11/09 18:39:51, ananta wrote:
> This four line pattern has been repeated multiple times. Would it make sense
to
> move this to a static helper in TestScreen?

I'd rather change other files to use AuraTestHelper. I think that's cleaner.
I'll work on it in separate CL.

[oshima, 2012-11-09 18:56:28]

ben -> OWNERS

[oshima, 2012-11-12 21:35:44]

ben ->OWNERS

[Ben Goodger (Google), 2012-11-12 21:41:01]

Very nice!

LGTM

http://codereview.chromium.org/11363124/diff/14158/ash/shell.h
File ash/shell.h (right):

http://codereview.chromium.org/11363124/diff/14158/ash/shell.h#newcode532
ash/shell.h:532: // Recieves output change events and udpates the display
manager.
Receives

[commit-bot: I haz the power, 2012-11-13 17:47:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/11363124/14158

[commit-bot: I haz the power, 2012-11-13 17:47:37]

Failed to apply patch for ash/shell.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ash/shell.h
  Hunk #2 FAILED at 269.
  Hunk #3 succeeded at 323 (offset -5 lines).
  Hunk #4 succeeded at 513 (offset -5 lines).
  1 out of 4 hunks FAILED -- saving rejects to file ash/shell.h.rej

Patch:       ash/shell.h
Index: ash/shell.h
diff --git a/ash/shell.h b/ash/shell.h
index
41ce0dd2019367fc0f6d46e690fb19a4a1032177..10adc61609b2713b3ddc1ce246bf9e894fa416af
100644
--- a/ash/shell.h
+++ b/ash/shell.h
@@ -85,6 +85,8 @@ class AcceleratorFilter;
 class ActivationController;
 class AppListController;
 class CaptureController;
+class DisplayChangeObserverX11;
+class DisplayManager;
 class DragDropController;
 class EventClientImpl;
 class EventRewriterEventFilter;
@@ -267,6 +269,9 @@ class ASH_EXPORT Shell :
internal::SystemModalContainerEventFilterDelegate,
   }
 #endif  // !defined(OS_MACOSX)
 
+  internal::DisplayManager* display_manager() {
+    return display_manager_.get();
+  }
   aura::shared::CompoundEventFilter* env_filter() {
     return env_filter_.get();
   }
@@ -326,7 +331,7 @@ class ASH_EXPORT Shell :
internal::SystemModalContainerEventFilterDelegate,
     return magnification_controller_.get();
   }
 
-  const ScreenAsh* screen() { return screen_; }
+  ScreenAsh* screen() { return screen_; }
 
   // Force the shelf to query for it's current visibility state.
   void UpdateShelfVisibility();
@@ -516,11 +521,16 @@ class ASH_EXPORT Shell :
internal::SystemModalContainerEventFilterDelegate,
   // a heads-up display. This is enabled only if --ash-touch-hud flag is used.
   scoped_ptr<internal::TouchObserverHUD> touch_observer_hud_;
 
+  scoped_ptr<internal::DisplayManager> display_manager_;
+
 #if defined(OS_CHROMEOS)
   // Controls video output device state.
   scoped_ptr<chromeos::OutputConfigurator> output_configurator_;
   scoped_ptr<internal::OutputConfiguratorAnimation>
       output_configurator_animation_;
+
+  // Recieves output change events and udpates the display manager.
+  scoped_ptr<internal::DisplayChangeObserverX11> display_change_observer_;
 #endif  // defined(OS_CHROMEOS)
 
   CursorManager cursor_manager_;

[oshima, 2012-11-13 17:49:37]

http://codereview.chromium.org/11363124/diff/14158/ash/shell.h
File ash/shell.h (right):

http://codereview.chromium.org/11363124/diff/14158/ash/shell.h#newcode532
ash/shell.h:532: // Recieves output change events and udpates the display
manager.
On 2012/11/12 21:41:01, Ben Goodger (Google) wrote:
> Receives

Done.

[commit-bot: I haz the power, 2012-11-13 21:46:00]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/11363124/291

[commit-bot: I haz the power, 2012-11-13 21:46:29]

Failed to apply patch for ash/ash.gyp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file ash/ash.gyp
  Hunk #1 FAILED at 74.
  Hunk #2 succeeded at 458 (offset 1 line).
  Hunk #3 succeeded at 520 (offset 1 line).
  Hunk #4 succeeded at 551 (offset 1 line).
  1 out of 4 hunks FAILED -- saving rejects to file ash/ash.gyp.rej

Patch:       ash/ash.gyp
Index: ash/ash.gyp
diff --git a/ash/ash.gyp b/ash/ash.gyp
index
a766593b0f89e6c16bcef746272d3cf6f62a401f..e48f467c701fc93f86c32e2b848218ab1cdf8d06
100644
--- a/ash/ash.gyp
+++ b/ash/ash.gyp
@@ -74,14 +74,16 @@
         'desktop_background/desktop_background_view.h',
         'desktop_background/desktop_background_widget_controller.cc',
         'desktop_background/desktop_background_widget_controller.h',
+        'display/display_change_observer_x11.cc',
+        'display/display_change_observer_x11.h',
         'display/display_controller.cc',
         'display/display_controller.h',
         'display/display_error_dialog.cc',
         'display/display_error_dialog.h',
+        'display/display_manager.cc',
+        'display/display_manager.h',
         'display/mouse_cursor_event_filter.cc',
         'display/mouse_cursor_event_filter.h',
-        'display/multi_display_manager.cc',
-        'display/multi_display_manager.h',
         'display/output_configurator_animation.cc',
         'display/output_configurator_animation.h',
         'display/screen_position_controller.cc',
@@ -457,15 +459,14 @@
       'sources': [
         'test/ash_test_base.cc',
         'test/ash_test_base.h',
-        'test/ash_unittests.cc',
         'test/capture_tracking_view.cc',
         'test/capture_tracking_view.h',
         'test/cursor_manager_test_api.cc',
         'test/cursor_manager_test_api.h',
         'test/launcher_view_test_api.cc',
         'test/launcher_view_test_api.h',
-        'test/multi_display_manager_test_api.cc',
-        'test/multi_display_manager_test_api.h',
+        'test/display_manager_test_api.cc',
+        'test/display_manager_test_api.h',
         'test/test_activation_delegate.cc',
         'test/test_activation_delegate.h',
         'test/test_launcher_delegate.cc',
@@ -520,7 +521,7 @@
         'dip_unittest.cc',
         'display/display_controller_unittest.cc',
         'display/mouse_cursor_event_filter_unittest.cc',
-        'display/multi_display_manager_unittest.cc',
+        'display/display_manager_unittest.cc',
         'display/screen_position_controller_unittest.cc',
         'drag_drop/drag_drop_controller_unittest.cc',
         'drag_drop/drag_drop_tracker_unittest.cc',
@@ -551,6 +552,7 @@
         'shell/window_watcher_unittest.cc',
         'system/tray/system_tray_unittest.cc',
         'system/web_notification/web_notification_tray_unittest.cc',
+        'test/ash_unittests.cc',
         'tooltips/tooltip_controller_unittest.cc',
         'wm/activation_controller_unittest.cc',
         'wm/base_layout_manager_unittest.cc',

[commit-bot: I haz the power, 2012-11-14 04:11:29]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/11363124/7021

[commit-bot: I haz the power, 2012-11-14 04:56:12]

Sorry for I got bad news for ya.
Compile failed with a clobber build on linux_chromeos.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...
Your code is likely broken or HEAD is junk. Please ensure your
code is not broken then alert the build sheriffs.
Look at the try server FAQ for more details.

[commit-bot: I haz the power, 2012-11-14 08:05:25]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/oshima@chromium.org/11363124/11237

[commit-bot: I haz the power, 2012-11-14 10:11:02]

Change committed as 167639