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

Unified Diff: chrome/chrome_browser.gypi

Issue 1907263003: media: Set MediaClientAndroid in the GPU process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chrome_browser_main_android.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 8bd0893419b8029fb7870fdfe48c354bd58a6555..d48d3617d3722c4876e59a4e9bd9fc68d3038c72 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -461,10 +461,6 @@
'browser/policy/schema_registry_service.h',
'browser/policy/schema_registry_service_factory.cc',
'browser/policy/schema_registry_service_factory.h',
- 'browser/sessions/restore_on_startup_policy_handler.cc',
- 'browser/sessions/restore_on_startup_policy_handler.h',
- 'browser/profiles/incognito_mode_policy_handler.cc',
- 'browser/profiles/incognito_mode_policy_handler.h',
'browser/prerender/prerender_config.cc',
'browser/prerender/prerender_config.h',
'browser/prerender/prerender_contents.cc',
@@ -503,10 +499,12 @@
'browser/process_resource_usage.h',
'browser/process_singleton.h',
'browser/process_singleton_win.cc',
- 'browser/push_messaging/background_budget_service.h',
+ 'browser/profiles/incognito_mode_policy_handler.cc',
+ 'browser/profiles/incognito_mode_policy_handler.h',
'browser/push_messaging/background_budget_service.cc',
- 'browser/push_messaging/background_budget_service_factory.h',
+ 'browser/push_messaging/background_budget_service.h',
'browser/push_messaging/background_budget_service_factory.cc',
+ 'browser/push_messaging/background_budget_service_factory.h',
'browser/push_messaging/push_messaging_app_identifier.cc',
'browser/push_messaging/push_messaging_app_identifier.h',
'browser/push_messaging/push_messaging_constants.cc',
@@ -571,13 +569,15 @@
'browser/search/suggestions/suggestions_ui.h',
'browser/search/thumbnail_source.cc',
'browser/search/thumbnail_source.h',
+ 'browser/sessions/restore_on_startup_policy_handler.cc',
+ 'browser/sessions/restore_on_startup_policy_handler.h',
'browser/shell_integration.cc',
'browser/shell_integration.h',
'browser/shell_integration_android.cc',
'browser/shell_integration_chromeos.cc',
'browser/shell_integration_mac.mm',
- 'browser/shell_integration_win.h',
'browser/shell_integration_win.cc',
+ 'browser/shell_integration_win.h',
'browser/site_details.cc',
'browser/site_details.h',
'browser/speech/chrome_speech_recognition_manager_delegate.cc',
@@ -674,7 +674,6 @@
'chrome_browser_android_java_ui_sources': [
'browser/after_startup_task_utils_android.cc',
'browser/after_startup_task_utils_android.h',
- 'browser/platform_util_android.cc',
'browser/android/accessibility/font_size_prefs_android.cc',
'browser/android/accessibility/font_size_prefs_android.h',
'browser/android/accessibility_util.cc',
@@ -708,8 +707,6 @@
'browser/android/chrome_feature_list.h',
'browser/android/chrome_jni_registrar.cc',
'browser/android/chrome_jni_registrar.h',
- 'browser/android/chrome_media_client_android.cc',
- 'browser/android/chrome_media_client_android.h',
'browser/android/chrome_startup_flags.cc',
'browser/android/chrome_startup_flags.h',
'browser/android/compositor/compositor_view.cc',
@@ -720,13 +717,13 @@
'browser/android/compositor/layer/content_layer.h',
'browser/android/compositor/layer/contextual_search_layer.cc',
'browser/android/compositor/layer/contextual_search_layer.h',
+ 'browser/android/compositor/layer/crushed_sprite_layer.cc',
+ 'browser/android/compositor/layer/crushed_sprite_layer.h',
+ 'browser/android/compositor/layer/layer.h',
'browser/android/compositor/layer/overlay_panel_layer.cc',
'browser/android/compositor/layer/overlay_panel_layer.h',
'browser/android/compositor/layer/reader_mode_layer.cc',
'browser/android/compositor/layer/reader_mode_layer.h',
- 'browser/android/compositor/layer/crushed_sprite_layer.cc',
- 'browser/android/compositor/layer/crushed_sprite_layer.h',
- 'browser/android/compositor/layer/layer.h',
'browser/android/compositor/layer/tab_handle_layer.cc',
'browser/android/compositor/layer/tab_handle_layer.h',
'browser/android/compositor/layer/tab_layer.cc',
@@ -881,6 +878,8 @@
'browser/android/ntp/ntp_snippets_bridge.h',
'browser/android/ntp/ntp_snippets_launcher.cc',
'browser/android/ntp/ntp_snippets_launcher.h',
+ 'browser/android/ntp/popular_sites.cc',
+ 'browser/android/ntp/popular_sites.h',
'browser/android/omnibox/answers_image_bridge.cc',
'browser/android/omnibox/answers_image_bridge.h',
'browser/android/omnibox/autocomplete_controller_android.cc',
@@ -889,8 +888,6 @@
'browser/android/omnibox/omnibox_prerender.h',
'browser/android/password_ui_view_android.cc',
'browser/android/password_ui_view_android.h',
- 'browser/android/ntp/popular_sites.cc',
- 'browser/android/ntp/popular_sites.h',
'browser/android/precache/precache_launcher.cc',
'browser/android/precache/precache_launcher.h',
'browser/android/preferences/autofill/autofill_profile_bridge.cc',
@@ -1004,8 +1001,6 @@
'browser/net/spdyproxy/data_reduction_proxy_settings_android.cc',
'browser/net/spdyproxy/data_reduction_proxy_settings_android.h',
'browser/password_manager/account_chooser_dialog_android.cc',
- 'browser/password_manager/update_password_infobar_delegate.cc',
- 'browser/password_manager/update_password_infobar_delegate.h',
'browser/password_manager/account_chooser_dialog_android.h',
'browser/password_manager/auto_signin_first_run_dialog_android.cc',
'browser/password_manager/auto_signin_first_run_dialog_android.h',
@@ -1013,8 +1008,11 @@
'browser/password_manager/credential_android.h',
'browser/password_manager/generated_password_saved_infobar_delegate_android.cc',
'browser/password_manager/generated_password_saved_infobar_delegate_android.h',
+ 'browser/password_manager/update_password_infobar_delegate.cc',
+ 'browser/password_manager/update_password_infobar_delegate.h',
'browser/permissions/permission_queue_controller.cc',
'browser/permissions/permission_queue_controller.h',
+ 'browser/platform_util_android.cc',
'browser/precache/precache_manager_factory.cc',
'browser/precache/precache_manager_factory.h',
'browser/prerender/external_prerender_handler_android.cc',
@@ -1124,8 +1122,8 @@
],
# Desktop Linux, ChromeOS, and Windows.
'chrome_browser_non_mac_desktop_sources': [
- 'browser/renderer_context_menu/spelling_options_submenu_observer.h',
'browser/renderer_context_menu/spelling_options_submenu_observer.cc',
+ 'browser/renderer_context_menu/spelling_options_submenu_observer.h',
],
# Desktop linux, doesn't count ChromeOS.
'chrome_browser_linux_desktop_sources': [
@@ -1260,11 +1258,11 @@
'browser/importer/profile_writer.h',
'browser/lifetime/browser_close_manager.cc',
'browser/lifetime/browser_close_manager.h',
- 'browser/lifetime/keep_alive_types.cc',
- 'browser/lifetime/keep_alive_types.h',
'browser/lifetime/keep_alive_registry.cc',
'browser/lifetime/keep_alive_registry.h',
'browser/lifetime/keep_alive_state_observer.h',
+ 'browser/lifetime/keep_alive_types.cc',
+ 'browser/lifetime/keep_alive_types.h',
'browser/lifetime/scoped_keep_alive.cc',
'browser/lifetime/scoped_keep_alive.h',
'browser/media/tab_desktop_media_list.cc',
@@ -2136,10 +2134,10 @@
'browser/net/resource_prefetch_predictor_observer.h',
'browser/net/safe_search_util.cc',
'browser/net/safe_search_util.h',
- 'browser/net/service_providers_win.cc',
- 'browser/net/service_providers_win.h',
'browser/net/sdch_owner_pref_storage.cc',
'browser/net/sdch_owner_pref_storage.h',
+ 'browser/net/service_providers_win.cc',
+ 'browser/net/service_providers_win.h',
'browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.cc',
'browser/net/spdyproxy/data_reduction_proxy_chrome_io_data.h',
'browser/net/spdyproxy/data_reduction_proxy_chrome_settings.cc',
@@ -2280,8 +2278,8 @@
'chrome_browser_plugins_sources': [
'browser/browsing_data/browsing_data_flash_lso_helper.cc',
'browser/browsing_data/browsing_data_flash_lso_helper.h',
- 'browser/component_updater/pepper_flash_component_installer.h',
'browser/component_updater/pepper_flash_component_installer.cc',
+ 'browser/component_updater/pepper_flash_component_installer.h',
'browser/metrics/plugin_metrics_provider.cc',
'browser/metrics/plugin_metrics_provider.h',
'browser/pepper_broker_infobar_delegate.cc',
@@ -2848,6 +2846,8 @@
'browser/ssl/bad_clock_blocking_page.h',
'browser/ssl/cert_report_helper.cc',
'browser/ssl/cert_report_helper.h',
+ 'browser/ssl/chrome_expect_ct_reporter.cc',
+ 'browser/ssl/chrome_expect_ct_reporter.h',
'browser/ssl/chrome_security_state_model_client.cc',
'browser/ssl/chrome_security_state_model_client.h',
'browser/ssl/chrome_ssl_host_state_delegate.cc',
@@ -2856,8 +2856,6 @@
'browser/ssl/chrome_ssl_host_state_delegate_factory.h',
'browser/ssl/common_name_mismatch_handler.cc',
'browser/ssl/common_name_mismatch_handler.h',
- 'browser/ssl/chrome_expect_ct_reporter.cc',
- 'browser/ssl/chrome_expect_ct_reporter.h',
'browser/ssl/ssl_blocking_page.cc',
'browser/ssl/ssl_blocking_page.h',
'browser/ssl/ssl_cert_reporter.h',
@@ -2881,14 +2879,14 @@
'browser/supervised_user/child_accounts/family_info_fetcher.h',
'browser/supervised_user/child_accounts/permission_request_creator_apiary.cc',
'browser/supervised_user/child_accounts/permission_request_creator_apiary.h',
+ 'browser/supervised_user/experimental/safe_search_url_reporter.cc',
+ 'browser/supervised_user/experimental/safe_search_url_reporter.h',
'browser/supervised_user/experimental/supervised_user_async_url_checker.cc',
'browser/supervised_user/experimental/supervised_user_async_url_checker.h',
'browser/supervised_user/experimental/supervised_user_blacklist.cc',
'browser/supervised_user/experimental/supervised_user_blacklist.h',
'browser/supervised_user/experimental/supervised_user_filtering_switches.cc',
'browser/supervised_user/experimental/supervised_user_filtering_switches.h',
- 'browser/supervised_user/experimental/safe_search_url_reporter.cc',
- 'browser/supervised_user/experimental/safe_search_url_reporter.h',
'browser/supervised_user/permission_request_creator.h',
'browser/supervised_user/supervised_user_bookmarks_handler.cc',
'browser/supervised_user/supervised_user_bookmarks_handler.h',
« no previous file with comments | « chrome/browser/chrome_browser_main_android.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698