| Index: ash/ash.gyp
|
| diff --git a/ash/ash.gyp b/ash/ash.gyp
|
| index 2577a4a88b6d5080f5edb590c9b685af855523f4..e2e6347065ff6e8ff99c44ca0025b45bc2fb070c 100644
|
| --- a/ash/ash.gyp
|
| +++ b/ash/ash.gyp
|
| @@ -47,8 +47,8 @@
|
| 'ash_touch_exploration_manager_chromeos.h',
|
| 'cancel_mode.cc',
|
| 'cancel_mode.h',
|
| - 'content/display/screen_orientation_delegate_chromeos.cc',
|
| - 'content/display/screen_orientation_delegate_chromeos.h',
|
| + 'content/display/screen_orientation_controller_chromeos.cc',
|
| + 'content/display/screen_orientation_controller_chromeos.h',
|
| 'debug.cc',
|
| 'debug.h',
|
| 'default_accessibility_delegate.cc',
|
| @@ -765,7 +765,7 @@
|
| 'accelerators/spoken_feedback_toggler_unittest.cc',
|
| 'ash_touch_exploration_manager_chromeos_unittest.cc',
|
| 'autoclick/autoclick_unittest.cc',
|
| - 'content/display/screen_orientation_delegate_chromeos_unittest.cc',
|
| + 'content/display/screen_orientation_controller_chromeos_unittest.cc',
|
| 'desktop_background/desktop_background_controller_unittest.cc',
|
| 'desktop_background/wallpaper_resizer_unittest.cc',
|
| 'dip_unittest.cc',
|
| @@ -965,6 +965,8 @@
|
| ],
|
| }, { # else: chromeos!=1
|
| 'sources!': [
|
| + 'content/display/screen_orientation_controller_chromeos.cc',
|
| + 'content/display/screen_orientation_controller_chromeos.h',
|
| 'display/display_configurator_animation.cc',
|
| 'display/display_configurator_animation.h',
|
| 'display/resolution_notification_controller.cc',
|
| @@ -1110,7 +1112,7 @@
|
| 'conditions': [
|
| ['chromeos==0', {
|
| 'sources!': [
|
| - 'content/display/screen_orientation_delegate_chromeos_unittest.cc',
|
| + 'content/display/screen_orientation_controller_chromeos_unittest.cc',
|
| # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906
|
| 'focus_cycler_unittest.cc',
|
| # All tests for multiple displays: not supported on Windows Ash.
|
| @@ -1120,6 +1122,7 @@
|
| 'wm/workspace/workspace_window_resizer_unittest.cc',
|
| 'sticky_keys/sticky_keys_overlay_unittest.cc',
|
| 'sticky_keys/sticky_keys_unittest.cc',
|
| + 'system/chromeos/rotation/tray_rotation_lock_unittest.cc',
|
| 'system/tray/media_security/multi_profile_media_tray_item_unittest.cc',
|
| 'autoclick/autoclick_unittest.cc',
|
| "virtual_keyboard_controller_unittest.cc"
|
|
|