Index: ash/ash.gyp |
diff --git a/ash/ash.gyp b/ash/ash.gyp |
index 2702576bf29c6e7a4617470f66fc1507c19666a5..6fea1e4b2a4912a1e75aeb3b4a5760e5372cdebf 100644 |
--- a/ash/ash.gyp |
+++ b/ash/ash.gyp |
@@ -245,16 +245,16 @@ |
'common/system/chromeos/palette/tools/capture_screen_action.h', |
'common/system/chromeos/palette/tools/create_note_action.cc', |
'common/system/chromeos/palette/tools/create_note_action.h', |
- 'common/system/chromeos/palette/tools/magnifier_mode.cc', |
- 'common/system/chromeos/palette/tools/magnifier_mode.h', |
- 'common/system/chromeos/power/battery_notification.cc', |
- 'common/system/chromeos/power/battery_notification.h', |
'common/system/chromeos/palette/tools/laser_pointer_mode.cc', |
'common/system/chromeos/palette/tools/laser_pointer_mode.h', |
'common/system/chromeos/palette/tools/laser_pointer_points.cc', |
'common/system/chromeos/palette/tools/laser_pointer_points.h', |
'common/system/chromeos/palette/tools/laser_pointer_view.cc', |
'common/system/chromeos/palette/tools/laser_pointer_view.h', |
+ 'common/system/chromeos/palette/tools/magnifier_mode.cc', |
+ 'common/system/chromeos/palette/tools/magnifier_mode.h', |
+ 'common/system/chromeos/power/battery_notification.cc', |
+ 'common/system/chromeos/power/battery_notification.h', |
'common/system/chromeos/power/dual_role_notification.cc', |
'common/system/chromeos/power/dual_role_notification.h', |
'common/system/chromeos/power/power_status.cc', |
@@ -411,7 +411,14 @@ |
'common/system/web_notification/ash_popup_alignment_delegate.h', |
'common/system/web_notification/web_notification_tray.cc', |
'common/system/web_notification/web_notification_tray.h', |
+ 'common/wallpaper/wallpaper_controller.cc', |
+ 'common/wallpaper/wallpaper_controller.h', |
+ 'common/wallpaper/wallpaper_controller_observer.h', |
'common/wallpaper/wallpaper_delegate.h', |
+ 'common/wallpaper/wallpaper_view.cc', |
+ 'common/wallpaper/wallpaper_view.h', |
+ 'common/wallpaper/wallpaper_widget_controller.cc', |
+ 'common/wallpaper/wallpaper_widget_controller.h', |
'common/wm/always_on_top_controller.cc', |
'common/wm/always_on_top_controller.h', |
'common/wm/background_animator.cc', |
@@ -707,13 +714,6 @@ |
'utility/screenshot_controller.h', |
'virtual_keyboard_controller.cc', |
'virtual_keyboard_controller.h', |
- 'wallpaper/wallpaper_controller.cc', |
- 'wallpaper/wallpaper_controller.h', |
- 'wallpaper/wallpaper_controller_observer.h', |
- 'wallpaper/wallpaper_view.cc', |
- 'wallpaper/wallpaper_view.h', |
- 'wallpaper/wallpaper_widget_controller.cc', |
- 'wallpaper/wallpaper_widget_controller.h', |
'wm/ash_focus_rules.cc', |
'wm/ash_focus_rules.h', |
'wm/ash_native_cursor_manager.cc', |
@@ -965,12 +965,12 @@ |
'common/system/chromeos/palette/mock_palette_tool_delegate.h', |
'common/system/chromeos/palette/palette_tool_manager_unittest.cc', |
'common/system/chromeos/palette/tools/create_note_unittest.cc', |
- 'common/system/chromeos/palette/tools/screenshot_unittest.cc', |
'common/system/chromeos/palette/tools/laser_pointer_mode_test_api.cc', |
'common/system/chromeos/palette/tools/laser_pointer_mode_test_api.h', |
'common/system/chromeos/palette/tools/laser_pointer_points_test_api.cc', |
'common/system/chromeos/palette/tools/laser_pointer_points_test_api.h', |
'common/system/chromeos/palette/tools/laser_pointer_unittest.cc', |
+ 'common/system/chromeos/palette/tools/screenshot_unittest.cc', |
'common/system/chromeos/power/power_status_unittest.cc', |
'common/system/chromeos/power/power_status_view_unittest.cc', |
'common/system/chromeos/power/tray_power_unittest.cc', |
@@ -984,6 +984,7 @@ |
'common/system/tray/tray_details_view_unittest.cc', |
'common/system/update/tray_update_unittest.cc', |
'common/system/user/tray_user_unittest.cc', |
+ 'common/wallpaper/wallpaper_controller_unittest.cc', |
'common/wm/container_finder_unittest.cc', |
'common/wm/overview/cleanup_animation_observer_unittest.cc', |
'common/wm/workspace/workspace_event_handler_test_helper.cc', |
@@ -1044,7 +1045,6 @@ |
'touch/touchscreen_util_unittest.cc', |
'utility/screenshot_controller_unittest.cc', |
'virtual_keyboard_controller_unittest.cc', |
- 'wallpaper/wallpaper_controller_unittest.cc', |
'wm/always_on_top_controller_unittest.cc', |
'wm/ash_focus_rules_unittest.cc', |
'wm/ash_native_cursor_manager_unittest.cc', |