ash/ash.gyp - Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/ash.gyp

Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: ash/ash.gyp

diff --git a/ash/ash.gyp b/ash/ash.gyp

index f190980f9b30686d63bcee7c47a0168c8137b4f0..118969508ce8a4f29d2c34f60ac186dbd495488d 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',

@@ -455,15 +457,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',

@@ -518,7 +519,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',

@@ -549,6 +550,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',

« no previous file with comments | « ash/accelerators/accelerator_controller_unittest.cc ('k') | ash/display/display_change_observer_x11.h » ('j') | ash/shell.h » ('J')