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

Unified Diff: ui/display/display.gyp

Issue 192483007: Move chromeos/display/* to ui/display/chromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Include display.gyp into ChromeOS builds only Created 6 years, 9 months 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 | « ui/display/chromeos/x11/touchscreen_delegate_x11.cc ('k') | ui/display/display_export.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/display/display.gyp
diff --git a/ui/display/display.gyp b/ui/display/display.gyp
index 4d32fcfda3b06f53c316d445c43340c4f4a394fa..495ed0c658548606e168b270f0c8c54f4ea3e7cc 100644
--- a/ui/display/display.gyp
+++ b/ui/display/display.gyp
@@ -11,10 +11,37 @@
'target_name': 'display',
'type': '<(component)',
'dependencies': [
- '<(DEPTH)/base/base.gyp:base',
+ '../../base/base.gyp:base',
+ '../../ui/gfx/gfx.gyp:gfx_geometry',
+ ],
+ 'defines': [
+ 'DISPLAY_IMPLEMENTATION',
],
'sources': [
+ 'chromeos/native_display_delegate.h',
+ 'chromeos/native_display_observer.h',
+ 'chromeos/output_configurator.cc',
+ 'chromeos/output_configurator.h',
+ 'chromeos/x11/display_util.cc',
+ 'chromeos/x11/display_util.h',
+ 'chromeos/x11/native_display_delegate_x11.cc',
+ 'chromeos/x11/native_display_delegate_x11.h',
+ 'chromeos/x11/native_display_event_dispatcher_x11.cc',
+ 'chromeos/x11/native_display_event_dispatcher_x11.h',
+ 'chromeos/x11/touchscreen_delegate_x11.cc',
+ 'chromeos/x11/touchscreen_delegate_x11.h',
'display_constants.h',
+ 'display_export.h',
+ ],
+ 'conditions': [
+ ['use_x11 == 1', {
+ 'dependencies': [
+ '../../build/linux/system.gyp:x11',
+ '../../build/linux/system.gyp:xext',
+ '../../build/linux/system.gyp:xi',
+ '../../build/linux/system.gyp:xrandr',
+ ],
+ }],
],
},
],
« no previous file with comments | « ui/display/chromeos/x11/touchscreen_delegate_x11.cc ('k') | ui/display/display_export.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698