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

Side by Side Diff: trunk/src/ash/ash.gyp

Issue 25716004: Revert 226547 "Refactor LauncherItemController and LauncherItemD..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/ash/launcher/launcher.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 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 }, 9 },
10 'includes': [ 10 'includes': [
(...skipping 594 matching lines...) Expand 10 before | Expand all | Expand 10 after
605 'test/ash_test_helper.cc', 605 'test/ash_test_helper.cc',
606 'test/ash_test_helper.h', 606 'test/ash_test_helper.h',
607 'test/cursor_manager_test_api.cc', 607 'test/cursor_manager_test_api.cc',
608 'test/cursor_manager_test_api.h', 608 'test/cursor_manager_test_api.h',
609 'test/launcher_test_api.cc', 609 'test/launcher_test_api.cc',
610 'test/launcher_test_api.h', 610 'test/launcher_test_api.h',
611 'test/launcher_view_test_api.cc', 611 'test/launcher_view_test_api.cc',
612 'test/launcher_view_test_api.h', 612 'test/launcher_view_test_api.h',
613 'test/display_manager_test_api.cc', 613 'test/display_manager_test_api.cc',
614 'test/display_manager_test_api.h', 614 'test/display_manager_test_api.h',
615 'test/launcher_item_delegate_manager_test_api.cc',
616 'test/launcher_item_delegate_manager_test_api.h',
617 'test/mirror_window_test_api.cc', 615 'test/mirror_window_test_api.cc',
618 'test/mirror_window_test_api.h', 616 'test/mirror_window_test_api.h',
619 'test/shell_test_api.cc', 617 'test/shell_test_api.cc',
620 'test/shell_test_api.h', 618 'test/shell_test_api.h',
621 'test/test_activation_delegate.cc', 619 'test/test_activation_delegate.cc',
622 'test/test_activation_delegate.h', 620 'test/test_activation_delegate.h',
623 'test/test_user_wallpaper_delegate.cc', 621 'test/test_user_wallpaper_delegate.cc',
624 'test/test_user_wallpaper_delegate.h', 622 'test/test_user_wallpaper_delegate.h',
625 'test/test_launcher_delegate.cc', 623 'test/test_launcher_delegate.cc',
626 'test/test_launcher_delegate.h', 624 'test/test_launcher_delegate.h',
627 'test/test_launcher_item_delegate.cc',
628 'test/test_launcher_item_delegate.h',
629 'test/test_screenshot_delegate.cc', 625 'test/test_screenshot_delegate.cc',
630 'test/test_screenshot_delegate.cc', 626 'test/test_screenshot_delegate.cc',
631 'test/test_session_state_delegate.cc', 627 'test/test_session_state_delegate.cc',
632 'test/test_session_state_delegate.h', 628 'test/test_session_state_delegate.cc',
633 'test/test_shell_delegate.cc', 629 'test/test_shell_delegate.cc',
634 'test/test_shell_delegate.h', 630 'test/test_shell_delegate.h',
635 'test/test_suite.cc', 631 'test/test_suite.cc',
636 'test/test_suite.h', 632 'test/test_suite.h',
637 'test/test_suite_init.h', 633 'test/test_suite_init.h',
638 'test/test_suite_init.mm', 634 'test/test_suite_init.mm',
639 'test/test_system_tray_delegate.cc', 635 'test/test_system_tray_delegate.cc',
640 'test/test_system_tray_delegate.h', 636 'test/test_system_tray_delegate.h',
641 'test/ui_controls_factory_ash.cc', 637 'test/ui_controls_factory_ash.cc',
642 'test/ui_controls_factory_ash.h', 638 'test/ui_controls_factory_ash.h',
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
735 'shelf/scoped_observer_with_duplicated_sources_unittest.cc', 731 'shelf/scoped_observer_with_duplicated_sources_unittest.cc',
736 'shelf/shelf_layout_manager_unittest.cc', 732 'shelf/shelf_layout_manager_unittest.cc',
737 'shelf/shelf_navigator_unittest.cc', 733 'shelf/shelf_navigator_unittest.cc',
738 'shelf/shelf_widget_unittest.cc', 734 'shelf/shelf_widget_unittest.cc',
739 'shell_unittest.cc', 735 'shell_unittest.cc',
740 'shell/app_list.cc', 736 'shell/app_list.cc',
741 'shell/bubble.cc', 737 'shell/bubble.cc',
742 'shell/context_menu.cc', 738 'shell/context_menu.cc',
743 'shell/context_menu.h', 739 'shell/context_menu.h',
744 'shell/launcher_delegate_impl.cc', 740 'shell/launcher_delegate_impl.cc',
745 'shell/launcher_delegate_impl.h',
746 'shell/lock_view.cc', 741 'shell/lock_view.cc',
747 'shell/panel_window.cc', 742 'shell/panel_window.cc',
748 'shell/panel_window.h',
749 'shell/shell_delegate_impl.cc', 743 'shell/shell_delegate_impl.cc',
750 'shell/shell_delegate_impl.h', 744 'shell/shell_delegate_impl.h',
751 'shell/toplevel_window.cc', 745 'shell/toplevel_window.cc',
752 'shell/toplevel_window.h',
753 'shell/widgets.cc', 746 'shell/widgets.cc',
754 'shell/window_type_launcher.cc', 747 'shell/window_type_launcher.cc',
755 'shell/window_type_launcher.h',
756 'shell/window_watcher.cc', 748 'shell/window_watcher.cc',
757 'shell/window_watcher.h',
758 'shell/window_watcher_launcher_item_delegate.cc',
759 'shell/window_watcher_launcher_item_delegate.h',
760 'shell/window_watcher_unittest.cc', 749 'shell/window_watcher_unittest.cc',
761 'system/chromeos/managed/tray_locally_managed_user_unittest.cc', 750 'system/chromeos/managed/tray_locally_managed_user_unittest.cc',
762 'system/chromeos/network/network_state_notifier_unittest.cc', 751 'system/chromeos/network/network_state_notifier_unittest.cc',
763 'system/chromeos/power/power_status_unittest.cc', 752 'system/chromeos/power/power_status_unittest.cc',
764 'system/chromeos/power/tray_power_unittest.cc', 753 'system/chromeos/power/tray_power_unittest.cc',
765 'system/chromeos/screen_security/screen_tray_item_unittest.cc', 754 'system/chromeos/screen_security/screen_tray_item_unittest.cc',
766 'system/chromeos/tray_display_unittest.cc', 755 'system/chromeos/tray_display_unittest.cc',
767 'system/date/date_view_unittest.cc', 756 'system/date/date_view_unittest.cc',
768 'system/tray/system_tray_unittest.cc', 757 'system/tray/system_tray_unittest.cc',
769 'system/user/tray_user_unittest.cc', 758 'system/user/tray_user_unittest.cc',
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 'shell/shell_main.cc', 894 'shell/shell_main.cc',
906 'shell/shell_main_parts.cc', 895 'shell/shell_main_parts.cc',
907 'shell/shell_main_parts.h', 896 'shell/shell_main_parts.h',
908 'shell/toplevel_window.cc', 897 'shell/toplevel_window.cc',
909 'shell/toplevel_window.h', 898 'shell/toplevel_window.h',
910 'shell/widgets.cc', 899 'shell/widgets.cc',
911 'shell/window_type_launcher.cc', 900 'shell/window_type_launcher.cc',
912 'shell/window_type_launcher.h', 901 'shell/window_type_launcher.h',
913 'shell/window_watcher.cc', 902 'shell/window_watcher.cc',
914 'shell/window_watcher.h', 903 'shell/window_watcher.h',
915 'shell/window_watcher_launcher_item_delegate.cc',
916 'shell/window_watcher_launcher_item_delegate.h',
917 '../content/app/startup_helper_win.cc', 904 '../content/app/startup_helper_win.cc',
918 '../ui/views/test/test_views_delegate.cc', 905 '../ui/views/test/test_views_delegate.cc',
919 ], 906 ],
920 'conditions': [ 907 'conditions': [
921 ['OS=="win"', { 908 ['OS=="win"', {
922 'msvs_settings': { 909 'msvs_settings': {
923 'VCLinkerTool': { 910 'VCLinkerTool': {
924 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 911 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
925 }, 912 },
926 }, 913 },
927 'dependencies': [ 914 'dependencies': [
928 '../sandbox/sandbox.gyp:sandbox', 915 '../sandbox/sandbox.gyp:sandbox',
929 ], 916 ],
930 }], 917 }],
931 ], 918 ],
932 }, 919 },
933 ], 920 ],
934 } 921 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/ash/launcher/launcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698