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

Side by Side Diff: ash/ash.gyp

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

Powered by Google App Engine
This is Rietveld 408576698