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

Side by Side Diff: chrome/chrome_browser.gypi

Issue 7067020: Moving mediaplayer to the chrome filebrowser. Observable behaviour should not change. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Resolved conflicts. Created 9 years, 6 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 | « chrome/browser/ui/webui/mediaplayer_ui.cc ('k') | chrome/chrome_tests.gypi » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'browser', 8 'target_name': 'browser',
9 'type': 'static_library', 9 'type': 'static_library',
10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA', 10 'msvs_guid': '5BF908A7-68FB-4A4B-99E3-8C749F1FE4EA',
(...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 'browser/chromeos/cros_settings_names.h', 409 'browser/chromeos/cros_settings_names.h',
410 'browser/chromeos/cros_settings_provider.cc', 410 'browser/chromeos/cros_settings_provider.cc',
411 'browser/chromeos/cros_settings_provider.h', 411 'browser/chromeos/cros_settings_provider.h',
412 'browser/chromeos/customization_document.cc', 412 'browser/chromeos/customization_document.cc',
413 'browser/chromeos/customization_document.h', 413 'browser/chromeos/customization_document.h',
414 'browser/chromeos/drop_shadow_label.cc', 414 'browser/chromeos/drop_shadow_label.cc',
415 'browser/chromeos/enterprise_extension_observer.cc', 415 'browser/chromeos/enterprise_extension_observer.cc',
416 'browser/chromeos/enterprise_extension_observer.h', 416 'browser/chromeos/enterprise_extension_observer.h',
417 'browser/chromeos/extensions/file_browser_event_router.cc', 417 'browser/chromeos/extensions/file_browser_event_router.cc',
418 'browser/chromeos/extensions/file_browser_event_router.h', 418 'browser/chromeos/extensions/file_browser_event_router.h',
419 'browser/chromeos/extensions/media_player_event_router.cc',
420 'browser/chromeos/extensions/media_player_event_router.h',
419 'browser/chromeos/external_metrics.cc', 421 'browser/chromeos/external_metrics.cc',
420 'browser/chromeos/external_metrics.h', 422 'browser/chromeos/external_metrics.h',
421 'browser/chromeos/external_protocol_dialog.cc', 423 'browser/chromeos/external_protocol_dialog.cc',
422 'browser/chromeos/external_protocol_dialog.h', 424 'browser/chromeos/external_protocol_dialog.h',
423 'browser/chromeos/frame/browser_frame_view_chromeos.cc', 425 'browser/chromeos/frame/browser_frame_view_chromeos.cc',
424 'browser/chromeos/frame/browser_frame_view_chromeos.h', 426 'browser/chromeos/frame/browser_frame_view_chromeos.h',
425 'browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.c c', 427 'browser/chromeos/frame/browser_non_client_frame_view_factory_chromeos.c c',
426 'browser/chromeos/frame/browser_view.cc', 428 'browser/chromeos/frame/browser_view.cc',
427 'browser/chromeos/frame/browser_view.h', 429 'browser/chromeos/frame/browser_view.h',
428 'browser/chromeos/frame/bubble_frame_view.cc', 430 'browser/chromeos/frame/bubble_frame_view.cc',
(...skipping 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
612 'browser/chromeos/login/webui_login_view.cc', 614 'browser/chromeos/login/webui_login_view.cc',
613 'browser/chromeos/login/wizard_accessibility_handler.cc', 615 'browser/chromeos/login/wizard_accessibility_handler.cc',
614 'browser/chromeos/login/wizard_accessibility_handler.h', 616 'browser/chromeos/login/wizard_accessibility_handler.h',
615 'browser/chromeos/login/wizard_accessibility_helper.cc', 617 'browser/chromeos/login/wizard_accessibility_helper.cc',
616 'browser/chromeos/login/wizard_accessibility_helper.h', 618 'browser/chromeos/login/wizard_accessibility_helper.h',
617 'browser/chromeos/login/wizard_controller.cc', 619 'browser/chromeos/login/wizard_controller.cc',
618 'browser/chromeos/login/wizard_controller.h', 620 'browser/chromeos/login/wizard_controller.h',
619 'browser/chromeos/login/wizard_screen.h', 621 'browser/chromeos/login/wizard_screen.h',
620 'browser/chromeos/low_battery_observer.cc', 622 'browser/chromeos/low_battery_observer.cc',
621 'browser/chromeos/low_battery_observer.h', 623 'browser/chromeos/low_battery_observer.h',
624 'browser/chromeos/media/media_player.cc',
625 'browser/chromeos/media/media_player.h',
622 'browser/chromeos/metrics_cros_settings_provider.cc', 626 'browser/chromeos/metrics_cros_settings_provider.cc',
623 'browser/chromeos/metrics_cros_settings_provider.h', 627 'browser/chromeos/metrics_cros_settings_provider.h',
624 'browser/chromeos/name_value_pairs_parser.cc', 628 'browser/chromeos/name_value_pairs_parser.cc',
625 'browser/chromeos/name_value_pairs_parser.h', 629 'browser/chromeos/name_value_pairs_parser.h',
626 'browser/chromeos/native_dialog_window.cc', 630 'browser/chromeos/native_dialog_window.cc',
627 'browser/chromeos/native_dialog_window.h', 631 'browser/chromeos/native_dialog_window.h',
628 'browser/chromeos/net/network_change_notifier_chromeos.cc', 632 'browser/chromeos/net/network_change_notifier_chromeos.cc',
629 'browser/chromeos/net/network_change_notifier_chromeos.h', 633 'browser/chromeos/net/network_change_notifier_chromeos.h',
630 'browser/chromeos/network_login_observer.cc', 634 'browser/chromeos/network_login_observer.cc',
631 'browser/chromeos/network_login_observer.h', 635 'browser/chromeos/network_login_observer.h',
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 'browser/extensions/extension_input_api.h', 955 'browser/extensions/extension_input_api.h',
952 'browser/extensions/extension_input_ui_api.cc', 956 'browser/extensions/extension_input_ui_api.cc',
953 'browser/extensions/extension_input_ui_api.h', 957 'browser/extensions/extension_input_ui_api.h',
954 'browser/extensions/extension_install_dialog.h', 958 'browser/extensions/extension_install_dialog.h',
955 'browser/extensions/extension_install_ui.cc', 959 'browser/extensions/extension_install_ui.cc',
956 'browser/extensions/extension_install_ui.h', 960 'browser/extensions/extension_install_ui.h',
957 'browser/extensions/extension_management_api.cc', 961 'browser/extensions/extension_management_api.cc',
958 'browser/extensions/extension_management_api.h', 962 'browser/extensions/extension_management_api.h',
959 'browser/extensions/extension_menu_manager.cc', 963 'browser/extensions/extension_menu_manager.cc',
960 'browser/extensions/extension_menu_manager.h', 964 'browser/extensions/extension_menu_manager.h',
965 'browser/extensions/extension_mediaplayer_private_api.h',
966 'browser/extensions/extension_mediaplayer_private_api.cc',
961 'browser/extensions/extension_message_handler.cc', 967 'browser/extensions/extension_message_handler.cc',
962 'browser/extensions/extension_message_handler.h', 968 'browser/extensions/extension_message_handler.h',
963 'browser/extensions/extension_message_service.cc', 969 'browser/extensions/extension_message_service.cc',
964 'browser/extensions/extension_message_service.h', 970 'browser/extensions/extension_message_service.h',
965 'browser/extensions/extension_metrics_module.cc', 971 'browser/extensions/extension_metrics_module.cc',
966 'browser/extensions/extension_metrics_module.h', 972 'browser/extensions/extension_metrics_module.h',
967 'browser/extensions/extension_module.cc', 973 'browser/extensions/extension_module.cc',
968 'browser/extensions/extension_module.h', 974 'browser/extensions/extension_module.h',
969 'browser/extensions/extension_omnibox_api.cc', 975 'browser/extensions/extension_omnibox_api.cc',
970 'browser/extensions/extension_omnibox_api.h', 976 'browser/extensions/extension_omnibox_api.h',
(...skipping 2363 matching lines...) Expand 10 before | Expand all | Expand 10 after
3334 'browser/ui/webui/history2_ui.cc', 3340 'browser/ui/webui/history2_ui.cc',
3335 'browser/ui/webui/history2_ui.h', 3341 'browser/ui/webui/history2_ui.h',
3336 'browser/ui/webui/history_ui.cc', 3342 'browser/ui/webui/history_ui.cc',
3337 'browser/ui/webui/history_ui.h', 3343 'browser/ui/webui/history_ui.h',
3338 'browser/ui/webui/html_dialog_tab_contents_delegate.cc', 3344 'browser/ui/webui/html_dialog_tab_contents_delegate.cc',
3339 'browser/ui/webui/html_dialog_tab_contents_delegate.h', 3345 'browser/ui/webui/html_dialog_tab_contents_delegate.h',
3340 'browser/ui/webui/html_dialog_ui.cc', 3346 'browser/ui/webui/html_dialog_ui.cc',
3341 'browser/ui/webui/html_dialog_ui.h', 3347 'browser/ui/webui/html_dialog_ui.h',
3342 'browser/ui/webui/keyboard_ui.cc', 3348 'browser/ui/webui/keyboard_ui.cc',
3343 'browser/ui/webui/keyboard_ui.h', 3349 'browser/ui/webui/keyboard_ui.h',
3344 'browser/ui/webui/mediaplayer_ui.cc',
3345 'browser/ui/webui/mediaplayer_ui.h',
3346 'browser/ui/webui/net_internals_ui.cc', 3350 'browser/ui/webui/net_internals_ui.cc',
3347 'browser/ui/webui/net_internals_ui.h', 3351 'browser/ui/webui/net_internals_ui.h',
3348 'browser/ui/webui/ntp/app_launcher_handler.cc', 3352 'browser/ui/webui/ntp/app_launcher_handler.cc',
3349 'browser/ui/webui/ntp/app_launcher_handler.h', 3353 'browser/ui/webui/ntp/app_launcher_handler.h',
3350 'browser/ui/webui/ntp/foreign_session_handler.cc', 3354 'browser/ui/webui/ntp/foreign_session_handler.cc',
3351 'browser/ui/webui/ntp/foreign_session_handler.h', 3355 'browser/ui/webui/ntp/foreign_session_handler.h',
3352 'browser/ui/webui/ntp/most_visited_handler.cc', 3356 'browser/ui/webui/ntp/most_visited_handler.cc',
3353 'browser/ui/webui/ntp/most_visited_handler.h', 3357 'browser/ui/webui/ntp/most_visited_handler.h',
3354 'browser/ui/webui/ntp/new_tab_page_sync_handler.cc', 3358 'browser/ui/webui/ntp/new_tab_page_sync_handler.cc',
3355 'browser/ui/webui/ntp/new_tab_page_sync_handler.h', 3359 'browser/ui/webui/ntp/new_tab_page_sync_handler.h',
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
3545 }], 3549 }],
3546 ['chromeos==0', { 3550 ['chromeos==0', {
3547 'sources/': [ 3551 'sources/': [
3548 ['exclude', '^browser/chromeos'], 3552 ['exclude', '^browser/chromeos'],
3549 ['exclude', '^browser/extensions/extension_input_ui_api.cc'], 3553 ['exclude', '^browser/extensions/extension_input_ui_api.cc'],
3550 ['exclude', '^browser/extensions/extension_input_ui_api.h'], 3554 ['exclude', '^browser/extensions/extension_input_ui_api.h'],
3551 ['exclude', '^browser/ui/webui/chromeos'], 3555 ['exclude', '^browser/ui/webui/chromeos'],
3552 ['exclude', '^browser/ui/webui/options/chromeos'], 3556 ['exclude', '^browser/ui/webui/options/chromeos'],
3553 ['exclude', 'browser/extensions/extension_file_browser_private_api.c c'], 3557 ['exclude', 'browser/extensions/extension_file_browser_private_api.c c'],
3554 ['exclude', 'browser/extensions/extension_file_browser_private_api.h '], 3558 ['exclude', 'browser/extensions/extension_file_browser_private_api.h '],
3559 ['exclude', 'browser/extensions/extension_mediaplayer_private_api.cc '],
3560 ['exclude', 'browser/extensions/extension_mediaplayer_private_api.h' ],
3555 ['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'], 3561 ['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
3556 ['exclude', 'browser/extensions/file_manager_util.h'], 3562 ['exclude', 'browser/extensions/file_manager_util.h'],
3557 ['exclude', 'browser/extensions/file_manager_util.cc'], 3563 ['exclude', 'browser/extensions/file_manager_util.cc'],
3558 ['exclude', 'browser/oom_priority_manager.cc'], 3564 ['exclude', 'browser/oom_priority_manager.cc'],
3559 ['exclude', 'browser/oom_priority_manager.h'], 3565 ['exclude', 'browser/oom_priority_manager.h'],
3560 ['exclude', 'browser/policy/device_policy_cache.cc'], 3566 ['exclude', 'browser/policy/device_policy_cache.cc'],
3561 ['exclude', 'browser/policy/device_policy_cache.h'], 3567 ['exclude', 'browser/policy/device_policy_cache.h'],
3562 ['exclude', 'browser/policy/enterprise_install_attributes.cc'], 3568 ['exclude', 'browser/policy/enterprise_install_attributes.cc'],
3563 ['exclude', 'browser/policy/enterprise_install_attributes.h'], 3569 ['exclude', 'browser/policy/enterprise_install_attributes.h'],
3564 ['exclude', 'browser/policy/device_policy_identity_strategy.cc'], 3570 ['exclude', 'browser/policy/device_policy_identity_strategy.cc'],
3565 ['exclude', 'browser/policy/device_policy_identity_strategy.h'], 3571 ['exclude', 'browser/policy/device_policy_identity_strategy.h'],
3566 ['exclude', 'browser/policy/proto/chrome_device_policy.pb.cc'], 3572 ['exclude', 'browser/policy/proto/chrome_device_policy.pb.cc'],
3567 ['exclude', 'browser/policy/proto/chrome_device_policy.pb.h'], 3573 ['exclude', 'browser/policy/proto/chrome_device_policy.pb.h'],
3568 ['exclude', 'browser/renderer_host/offline_resource_handler.cc'], 3574 ['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
3569 ['exclude', 'browser/renderer_host/offline_resource_handler.h'], 3575 ['exclude', 'browser/renderer_host/offline_resource_handler.h'],
3570 ['exclude', 'browser/ui/login/login_prompt_ui.cc'], 3576 ['exclude', 'browser/ui/login/login_prompt_ui.cc'],
3571 ['exclude', 'browser/ui/webui/active_downloads_ui.cc'], 3577 ['exclude', 'browser/ui/webui/active_downloads_ui.cc'],
3572 ['exclude', 'browser/ui/webui/collected_cookies_ui_delegate.cc'], 3578 ['exclude', 'browser/ui/webui/collected_cookies_ui_delegate.cc'],
3573 ['exclude', 'browser/ui/webui/collected_cookies_ui_delegate.h'], 3579 ['exclude', 'browser/ui/webui/collected_cookies_ui_delegate.h'],
3574 ['exclude', 'browser/ui/webui/cookies_tree_model_adapter.cc'], 3580 ['exclude', 'browser/ui/webui/cookies_tree_model_adapter.cc'],
3575 ['exclude', 'browser/ui/webui/cookies_tree_model_adapter.h'], 3581 ['exclude', 'browser/ui/webui/cookies_tree_model_adapter.h'],
3576 ['exclude', 'browser/ui/webui/fileicon_source_cros.cc'], 3582 ['exclude', 'browser/ui/webui/fileicon_source_cros.cc'],
3577 ['exclude', 'browser/ui/webui/fileicon_source_cros.h'], 3583 ['exclude', 'browser/ui/webui/fileicon_source_cros.h'],
3578 ['exclude', 'browser/ui/webui/mediaplayer_ui.cc'],
3579 ], 3584 ],
3580 }], 3585 }],
3581 ['chromeos==1', { 3586 ['chromeos==1', {
3582 'sources!': [ 3587 'sources!': [
3583 'browser/background_mode_manager_linux.cc', 3588 'browser/background_mode_manager_linux.cc',
3584 'browser/first_run/upgrade_util.cc', 3589 'browser/first_run/upgrade_util.cc',
3585 'browser/first_run/upgrade_util.h', 3590 'browser/first_run/upgrade_util.h',
3586 'browser/first_run/upgrade_util_linux.cc', 3591 'browser/first_run/upgrade_util_linux.cc',
3587 'browser/password_manager/native_backend_gnome_x.cc', 3592 'browser/password_manager/native_backend_gnome_x.cc',
3588 'browser/password_manager/native_backend_gnome_x.h', 3593 'browser/password_manager/native_backend_gnome_x.h',
(...skipping 1012 matching lines...) Expand 10 before | Expand all | Expand 10 after
4601 'hard_dependency': 1, 4606 'hard_dependency': 1,
4602 }, 4607 },
4603 ], 4608 ],
4604 } 4609 }
4605 4610
4606 # Local Variables: 4611 # Local Variables:
4607 # tab-width:2 4612 # tab-width:2
4608 # indent-tabs-mode:nil 4613 # indent-tabs-mode:nil
4609 # End: 4614 # End:
4610 # vim: set expandtab tabstop=2 shiftwidth=2: 4615 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/mediaplayer_ui.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698