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

Side by Side Diff: ash/ash.gyp

Issue 2053113002: Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into animate_shelf_chip_backgrounds Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | ash/aura/wm_shelf_aura.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 # These files lists are shared with the GN build. 8 # These files lists are shared with the GN build.
9 'ash_sources': [ 9 'ash_sources': [
10 'accelerators/accelerator_commands_aura.cc', 10 'accelerators/accelerator_commands_aura.cc',
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 'common/shelf/app_list_shelf_item_delegate.h', 101 'common/shelf/app_list_shelf_item_delegate.h',
102 'common/shelf/ink_drop_button_listener.h', 102 'common/shelf/ink_drop_button_listener.h',
103 'common/shelf/overflow_bubble.cc', 103 'common/shelf/overflow_bubble.cc',
104 'common/shelf/overflow_bubble.h', 104 'common/shelf/overflow_bubble.h',
105 'common/shelf/overflow_bubble_view.cc', 105 'common/shelf/overflow_bubble_view.cc',
106 'common/shelf/overflow_bubble_view.h', 106 'common/shelf/overflow_bubble_view.h',
107 'common/shelf/overflow_button.cc', 107 'common/shelf/overflow_button.cc',
108 'common/shelf/overflow_button.h', 108 'common/shelf/overflow_button.h',
109 'common/shelf/shelf_alignment_menu.cc', 109 'common/shelf/shelf_alignment_menu.cc',
110 'common/shelf/shelf_alignment_menu.h', 110 'common/shelf/shelf_alignment_menu.h',
111 'common/shelf/shelf_background_animator.cc',
112 'common/shelf/shelf_background_animator.h',
113 'common/shelf/shelf_background_animator_observer.h',
111 'common/shelf/shelf_button.cc', 114 'common/shelf/shelf_button.cc',
112 'common/shelf/shelf_button.h', 115 'common/shelf/shelf_button.h',
113 'common/shelf/shelf_button_pressed_metric_tracker.cc', 116 'common/shelf/shelf_button_pressed_metric_tracker.cc',
114 'common/shelf/shelf_button_pressed_metric_tracker.h', 117 'common/shelf/shelf_button_pressed_metric_tracker.h',
115 'common/shelf/shelf_constants.cc', 118 'common/shelf/shelf_constants.cc',
116 'common/shelf/shelf_constants.h', 119 'common/shelf/shelf_constants.h',
117 'common/shelf/shelf_delegate.h', 120 'common/shelf/shelf_delegate.h',
118 'common/shelf/shelf_item_delegate.h', 121 'common/shelf/shelf_item_delegate.h',
119 'common/shelf/shelf_item_types.cc', 122 'common/shelf/shelf_item_types.cc',
120 'common/shelf/shelf_item_types.h', 123 'common/shelf/shelf_item_types.h',
(...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 'content/keyboard_overlay/keyboard_overlay_delegate.cc', 788 'content/keyboard_overlay/keyboard_overlay_delegate.cc',
786 'content/keyboard_overlay/keyboard_overlay_delegate.h', 789 'content/keyboard_overlay/keyboard_overlay_delegate.h',
787 'content/keyboard_overlay/keyboard_overlay_view.cc', 790 'content/keyboard_overlay/keyboard_overlay_view.cc',
788 'content/keyboard_overlay/keyboard_overlay_view.h', 791 'content/keyboard_overlay/keyboard_overlay_view.h',
789 'content/screen_orientation_delegate_chromeos.cc', 792 'content/screen_orientation_delegate_chromeos.cc',
790 'content/screen_orientation_delegate_chromeos.h', 793 'content/screen_orientation_delegate_chromeos.h',
791 'content/shell_content_state.cc', 794 'content/shell_content_state.cc',
792 'content/shell_content_state.h', 795 'content/shell_content_state.h',
793 ], 796 ],
794 'ash_test_support_sources': [ 797 'ash_test_support_sources': [
798 'common/test/material_design_controller_test_api.cc',
799 'common/test/material_design_controller_test_api.h',
795 'common/test/test_volume_control_delegate.cc', 800 'common/test/test_volume_control_delegate.cc',
796 'common/test/test_volume_control_delegate.h', 801 'common/test/test_volume_control_delegate.h',
797 'desktop_background/desktop_background_controller_test_api.cc', 802 'desktop_background/desktop_background_controller_test_api.cc',
798 'desktop_background/desktop_background_controller_test_api.h', 803 'desktop_background/desktop_background_controller_test_api.h',
799 'shell/toplevel_window.cc', 804 'shell/toplevel_window.cc',
800 'shell/toplevel_window.h', 805 'shell/toplevel_window.h',
801 'test/ash_md_test_base.cc', 806 'test/ash_md_test_base.cc',
802 'test/ash_md_test_base.h', 807 'test/ash_md_test_base.h',
803 'test/ash_test_base.cc', 808 'test/ash_test_base.cc',
804 'test/ash_test_base.h', 809 'test/ash_test_base.h',
805 'test/ash_test_helper.cc', 810 'test/ash_test_helper.cc',
806 'test/ash_test_helper.h', 811 'test/ash_test_helper.h',
807 'test/ash_test_views_delegate.cc', 812 'test/ash_test_views_delegate.cc',
808 'test/ash_test_views_delegate.h', 813 'test/ash_test_views_delegate.h',
809 'test/child_modal_window.cc', 814 'test/child_modal_window.cc',
810 'test/child_modal_window.h', 815 'test/child_modal_window.h',
811 'test/cursor_manager_test_api.cc', 816 'test/cursor_manager_test_api.cc',
812 'test/cursor_manager_test_api.h', 817 'test/cursor_manager_test_api.h',
813 'test/display_manager_test_api.cc', 818 'test/display_manager_test_api.cc',
814 'test/display_manager_test_api.h', 819 'test/display_manager_test_api.h',
815 'test/material_design_controller_test_api.cc',
816 'test/material_design_controller_test_api.h',
817 'test/mirror_window_test_api.cc', 820 'test/mirror_window_test_api.cc',
818 'test/mirror_window_test_api.h', 821 'test/mirror_window_test_api.h',
819 'test/overflow_bubble_view_test_api.cc', 822 'test/overflow_bubble_view_test_api.cc',
820 'test/overflow_bubble_view_test_api.h', 823 'test/overflow_bubble_view_test_api.h',
821 'test/shelf_button_pressed_metric_tracker_test_api.cc', 824 'test/shelf_button_pressed_metric_tracker_test_api.cc',
822 'test/shelf_button_pressed_metric_tracker_test_api.h', 825 'test/shelf_button_pressed_metric_tracker_test_api.h',
823 'test/shelf_test_api.h', 826 'test/shelf_test_api.h',
824 'test/shelf_view_test_api.cc', 827 'test/shelf_view_test_api.cc',
825 'test/shelf_view_test_api.h', 828 'test/shelf_view_test_api.h',
826 'test/shell_test_api.cc', 829 'test/shell_test_api.cc',
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
910 'accelerators/accelerator_filter_unittest.cc', 913 'accelerators/accelerator_filter_unittest.cc',
911 'accelerators/magnifier_key_scroller_unittest.cc', 914 'accelerators/magnifier_key_scroller_unittest.cc',
912 'accelerators/spoken_feedback_toggler_unittest.cc', 915 'accelerators/spoken_feedback_toggler_unittest.cc',
913 'app_list/app_list_presenter_delegate_unittest.cc', 916 'app_list/app_list_presenter_delegate_unittest.cc',
914 'ash_touch_exploration_manager_chromeos_unittest.cc', 917 'ash_touch_exploration_manager_chromeos_unittest.cc',
915 'autoclick/autoclick_unittest.cc', 918 'autoclick/autoclick_unittest.cc',
916 'common/accelerators/accelerator_table_unittest.cc', 919 'common/accelerators/accelerator_table_unittest.cc',
917 'common/display/display_info_unittest.cc', 920 'common/display/display_info_unittest.cc',
918 'common/material_design/material_design_controller_unittest.cc', 921 'common/material_design/material_design_controller_unittest.cc',
919 'common/popup_message_unittest.cc', 922 'common/popup_message_unittest.cc',
923 'common/shelf/shelf_background_animator_unittest.cc',
920 'common/shelf/shelf_button_pressed_metric_tracker_unittest.cc', 924 'common/shelf/shelf_button_pressed_metric_tracker_unittest.cc',
921 'common/shelf/shelf_locking_manager_unittest.cc', 925 'common/shelf/shelf_locking_manager_unittest.cc',
922 'common/shelf/shelf_model_unittest.cc', 926 'common/shelf/shelf_model_unittest.cc',
923 'common/shelf/shelf_navigator_unittest.cc', 927 'common/shelf/shelf_navigator_unittest.cc',
924 'common/system/chromeos/brightness/tray_brightness_unittest.cc', 928 'common/system/chromeos/brightness/tray_brightness_unittest.cc',
925 'common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc', 929 'common/system/chromeos/ime_menu/ime_menu_tray_unittest.cc',
926 'common/system/chromeos/media_security/multi_profile_media_tray_item_unitt est.cc', 930 'common/system/chromeos/media_security/multi_profile_media_tray_item_unitt est.cc',
927 'common/system/chromeos/palette/palette_tool_manager_unittest.cc', 931 'common/system/chromeos/palette/palette_tool_manager_unittest.cc',
928 'common/system/chromeos/power/power_status_unittest.cc', 932 'common/system/chromeos/power/power_status_unittest.cc',
929 'common/system/chromeos/power/power_status_view_unittest.cc', 933 'common/system/chromeos/power/power_status_view_unittest.cc',
(...skipping 545 matching lines...) Expand 10 before | Expand all | Expand 10 after
1475 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1479 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1476 ], 1480 ],
1477 } 1481 }
1478 ], 1482 ],
1479 ], 1483 ],
1480 }, 1484 },
1481 ], 1485 ],
1482 }], 1486 }],
1483 ], 1487 ],
1484 } 1488 }
OLDNEW
« no previous file with comments | « no previous file | ash/aura/wm_shelf_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698