Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Unified Diff: ui/aura/aura.gyp

Issue 11363124: Move DisplayManager and DisplayChangeObserverX11 from aura to ash. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix rebase 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
« no previous file with comments | « content/shell/shell_aura.cc ('k') | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/aura.gyp
diff --git a/ui/aura/aura.gyp b/ui/aura/aura.gyp
index 68d7c36d394b4e3d46a34a12e48012ea8aabab91..6fe1f70b700c4292ba3843bc1e5b0349ae92e921 100644
--- a/ui/aura/aura.gyp
+++ b/ui/aura/aura.gyp
@@ -64,8 +64,8 @@
'device_list_updater_aurax11.cc',
'device_list_updater_aurax11.h',
'dispatcher_win.cc',
- 'display_observer.cc',
- 'display_observer.h',
+ 'display_util.cc',
+ 'display_util.h',
'env.cc',
'env.h',
'env_observer.h',
@@ -76,10 +76,6 @@
'focus_manager.h',
'layout_manager.cc',
'layout_manager.h',
- 'display_change_observer_x11.cc',
- 'display_change_observer_x11.h',
- 'display_manager.cc',
- 'display_manager.h',
'remote_root_window_host_win.cc',
'remote_root_window_host_win.h',
'root_window_host.h',
@@ -96,8 +92,6 @@
'root_window_view_mac.mm',
'root_window.cc',
'root_window.h',
- 'single_display_manager.cc',
- 'single_display_manager.h',
'ui_controls_win.cc',
'ui_controls_x11.cc',
'window.cc',
@@ -209,6 +203,7 @@
'../ui.gyp:ui_resources',
'../../ipc/ipc.gyp:ipc',
'aura',
+ 'test_support_aura',
],
'include_dirs': [
'..',
@@ -231,6 +226,7 @@
'../ui.gyp:ui',
'../ui.gyp:ui_resources',
'aura',
+ 'test_support_aura',
],
'include_dirs': [
'..',
« no previous file with comments | « content/shell/shell_aura.cc ('k') | ui/aura/bench/bench_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698