Index: ash/ash.gyp |
diff --git a/ash/ash.gyp b/ash/ash.gyp |
index a3067f81eb35b08c09f99a737931e3e286af50ed..32940f678fb762a510f98ccfdce4e3d83d3883ac 100644 |
--- a/ash/ash.gyp |
+++ b/ash/ash.gyp |
@@ -61,6 +61,18 @@ |
'desktop_background/desktop_background_resources.h', |
'desktop_background/desktop_background_view.cc', |
'desktop_background/desktop_background_view.h', |
+ 'display/display_controller.cc', |
+ 'display/display_controller.h', |
+ 'display/output_configurator_animation.cc', |
+ 'display/output_configurator_animation.h', |
oshima
2012/07/26 14:08:17
sort
Jun Mukai
2012/07/27 02:22:53
Done.
|
+ 'display/mouse_cursor_event_filter.cc', |
+ 'display/mouse_cursor_event_filter.h', |
+ 'display/multi_display_manager.cc', |
+ 'display/multi_display_manager.h', |
+ 'display/screen_position_controller.cc', |
+ 'display/screen_position_controller.h', |
+ 'display/secondary_display_view.cc', |
+ 'display/secondary_display_view.h', |
'drag_drop/drag_drop_controller.cc', |
'drag_drop/drag_drop_controller.h', |
'drag_drop/drag_image_view.cc', |
@@ -101,16 +113,6 @@ |
'launcher/tabbed_launcher_button.h', |
'magnifier/magnification_controller.cc', |
'magnifier/magnification_controller.h', |
- 'display/display_controller.cc', |
- 'display/display_controller.h', |
- 'display/mouse_cursor_event_filter.cc', |
- 'display/mouse_cursor_event_filter.h', |
- 'display/multi_display_manager.cc', |
- 'display/multi_display_manager.h', |
- 'display/screen_position_controller.cc', |
- 'display/screen_position_controller.h', |
- 'display/secondary_display_view.cc', |
- 'display/secondary_display_view.h', |
'keyboard_overlay/keyboard_overlay_delegate.cc', |
'keyboard_overlay/keyboard_overlay_delegate.h', |
'keyboard_overlay/keyboard_overlay_view.cc', |
@@ -357,6 +359,11 @@ |
'dependencies': [ |
'../chromeos/chromeos.gyp:chromeos', |
], |
+ }, { # else: chromeos!=1 |
+ 'sources/': [ |
+ ['exclude', 'display/output_configurator_animation.cc'], |
+ ['exclude', 'display/output_configurator_animation.h'], |
+ ], |
}], |
], |
}, |