'browser/android/bookmarks/bookmarks_bridge.h',
'browser/android/bookmarks/partner_bookmarks_shim.cc',
'browser/android/bookmarks/partner_bookmarks_shim.h',
- 'browser/android/browser_version.cc',
- 'browser/android/browser_version.h',
'browser/android/chrome_jni_registrar.cc',
'browser/android/chrome_jni_registrar.h',
'browser/android/chrome_startup_flags.cc',
'browser/android/favicon_helper.h',
'browser/android/feature_utilities.cc',
'browser/android/feature_utilities.h',
+ 'browser/android/find_in_page/find_in_page_bridge.cc',
+ 'browser/android/find_in_page/find_in_page_bridge.h',
'browser/android/foreign_session_helper.cc',
'browser/android/foreign_session_helper.h',
'browser/android/logo_bridge.cc',
'browser/android/omnibox/autocomplete_controller_android.h',
'browser/android/omnibox/omnibox_prerender.cc',
'browser/android/omnibox/omnibox_prerender.h',
- 'browser/android/password_authentication_manager.cc',
- 'browser/android/password_authentication_manager.h',
'browser/android/password_ui_view_android.cc',
'browser/android/password_ui_view_android.h',
+ 'browser/android/preferences/pref_service_bridge.cc',
+ 'browser/android/preferences/pref_service_bridge.h',
'browser/android/profiles/profile_downloader_android.cc',
'browser/android/profiles/profile_downloader_android.h',
'browser/android/provider/blocking_ui_thread_async_request.cc',
'browser/android/tab_android.cc',
'browser/android/tab_android.h',
'browser/android/tab_load_status.h',
+ 'browser/android/tab_state.cc',
+ 'browser/android/tab_state.h',
'browser/android/thumbnail/thumbnail.cc',
'browser/android/thumbnail/thumbnail.h',
'browser/android/thumbnail/thumbnail_store.cc',
'browser/chrome_elf_init_win.cc',
'browser/chrome_elf_init_win.h',
'browser/chrome_notification_types.h',
- 'browser/chrome_page_zoom.cc',
- 'browser/chrome_page_zoom.h',
- 'browser/chrome_page_zoom_constants.cc',
- 'browser/chrome_page_zoom_constants.h',
'browser/chrome_select_file_dialog_factory_win.cc',
'browser/chrome_select_file_dialog_factory_win.h',
'browser/chrome_quota_permission_context.cc',
'browser/component_updater/sw_reporter_installer_win.h',
'browser/component_updater/swiftshader_component_installer.cc',
'browser/component_updater/swiftshader_component_installer.h',
- 'browser/content_settings/content_settings_default_provider.cc',
- 'browser/content_settings/content_settings_default_provider.h',
- 'browser/content_settings/content_settings_override_provider.cc',
- 'browser/content_settings/content_settings_override_provider.h',
- 'browser/content_settings/content_settings_policy_provider.cc',
- 'browser/content_settings/content_settings_policy_provider.h',
- 'browser/content_settings/content_settings_pref_provider.cc',
- 'browser/content_settings/content_settings_pref_provider.h',
+ 'browser/content_settings/chrome_content_settings_client.cc',
+ 'browser/content_settings/chrome_content_settings_client.h',
'browser/content_settings/content_settings_usages_state.cc',
'browser/content_settings/content_settings_usages_state.h',
- 'browser/content_settings/content_settings_utils.cc',
- 'browser/content_settings/content_settings_utils.h',
'browser/content_settings/cookie_settings.cc',
'browser/content_settings/cookie_settings.h',
- 'browser/content_settings/host_content_settings_map.cc',
- 'browser/content_settings/host_content_settings_map.h',
'browser/content_settings/local_shared_objects_container.cc',
'browser/content_settings/local_shared_objects_container.h',
'browser/content_settings/permission_bubble_request_impl.cc',
'browser/download/drag_download_item.h',
'browser/download/save_package_file_picker.cc',
'browser/download/save_package_file_picker.h',
+ 'browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service.cc',
+ 'browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service.h',
+ 'browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service_factory.cc',
+ 'browser/enhanced_bookmarks/chrome_bookmark_server_cluster_service_factory.h',
+ 'browser/enhanced_bookmarks/enhanced_bookmark_model_factory.cc',
+ 'browser/enhanced_bookmarks/enhanced_bookmark_model_factory.h',
'browser/enumerate_modules_model_win.cc',
'browser/enumerate_modules_model_win.h',
# Oh hey, all the cool browser/extensions files are hanging out in
'browser/favicon/favicon_service_factory.h',
'browser/favicon/favicon_tab_helper.cc',
'browser/favicon/favicon_tab_helper.h',
+ 'browser/favicon/favicon_tab_helper_observer.h',
'browser/file_select_helper.cc',
'browser/file_select_helper.h',
+ 'browser/file_select_helper_mac.mm',
'browser/flags_storage.h',
'browser/fullscreen.h',
'browser/fullscreen_chromeos.cc',
'browser/internal_auth.h',
'browser/intranet_redirect_detector.cc',
'browser/intranet_redirect_detector.h',
- 'browser/invalidation/invalidation_controller_android.cc',
- 'browser/invalidation/invalidation_controller_android.h',
- 'browser/invalidation/invalidation_service_android.cc',
- 'browser/invalidation/invalidation_service_android.h',
+ 'browser/invalidation/invalidation_service_factory_android.cc',
+ 'browser/invalidation/invalidation_service_factory_android.h',
'browser/invalidation/profile_invalidation_provider_factory.cc',
'browser/invalidation/profile_invalidation_provider_factory.h',
'browser/io_thread.cc',
'browser/memory_details_win.cc',
'browser/metrics/chrome_browser_main_extra_parts_metrics.cc',
'browser/metrics/chrome_browser_main_extra_parts_metrics.h',
+ 'browser/metrics/chrome_browser_main_extra_parts_metrics_mac.mm',
'browser/metrics/chrome_metrics_service_accessor.cc',
'browser/metrics/chrome_metrics_service_accessor.h',
'browser/metrics/chrome_metrics_service_client.cc',
'browser/metrics/field_trial_synchronizer.h',
'browser/metrics/google_update_metrics_provider_win.cc',
'browser/metrics/google_update_metrics_provider_win.h',
- 'browser/metrics/metric_event_duration_details.h',
'browser/metrics/metrics_reporting_state.cc',
'browser/metrics/metrics_reporting_state.h',
'browser/metrics/metrics_service_accessor.cc',
'browser/net/about_protocol_handler.h',
'browser/net/async_dns_field_trial.cc',
'browser/net/async_dns_field_trial.h',
+ 'browser/net/bit_stream_reader.cc',
+ 'browser/net/bit_stream_reader.h',
'browser/net/chrome_cookie_notification_details.h',
'browser/net/chrome_extensions_network_delegate.cc',
'browser/net/chrome_extensions_network_delegate.h',
'browser/net/chrome_net_log.h',
'browser/net/chrome_network_delegate.cc',
'browser/net/chrome_network_delegate.h',
+ 'browser/net/chrome_sdch_policy.cc',
+ 'browser/net/chrome_sdch_policy.h',
'browser/net/chrome_url_request_context_getter.cc',
'browser/net/chrome_url_request_context_getter.h',
'browser/net/client_hints.cc',
'browser/net/net_pref_observer.h',
'browser/net/network_stats.cc',
'browser/net/network_stats.h',
+ 'browser/net/packed_ct_ev_whitelist.cc',
+ 'browser/net/packed_ct_ev_whitelist.h',
'browser/net/preconnect.cc',
'browser/net/preconnect.h',
'browser/net/prediction_options.cc',
'browser/platform_util_chromeos.cc',
'browser/platform_util_mac.mm',
'browser/platform_util_win.cc',
- 'browser/power/process_power_collector.cc',
- 'browser/power/process_power_collector.h',
'browser/precache/most_visited_urls_provider.cc',
'browser/precache/most_visited_urls_provider.h',
'browser/predictors/autocomplete_action_predictor.cc',
'browser/prefs/command_line_pref_store.h',
'browser/prefs/incognito_mode_prefs.cc',
'browser/prefs/incognito_mode_prefs.h',
- 'browser/prefs/interceptable_pref_filter.cc',
- 'browser/prefs/interceptable_pref_filter.h',
'browser/prefs/leveldb_pref_store.cc',
'browser/prefs/leveldb_pref_store.h',
- 'browser/prefs/pref_hash_calculator.cc',
- 'browser/prefs/pref_hash_calculator.h',
- 'browser/prefs/pref_hash_filter.cc',
- 'browser/prefs/pref_hash_filter.h',
- 'browser/prefs/pref_hash_store.h',
- 'browser/prefs/pref_hash_store_impl.cc',
- 'browser/prefs/pref_hash_store_impl.h',
- 'browser/prefs/pref_hash_store_transaction.h',
'browser/prefs/pref_metrics_service.cc',
'browser/prefs/pref_metrics_service.h',
'browser/prefs/pref_model_associator.cc',
'browser/prefs/tracked/dictionary_hash_store_contents.cc',
'browser/prefs/tracked/dictionary_hash_store_contents.h',
'browser/prefs/tracked/hash_store_contents.h',
+ 'browser/prefs/tracked/interceptable_pref_filter.cc',
+ 'browser/prefs/tracked/interceptable_pref_filter.h',
+ 'browser/prefs/tracked/pref_hash_calculator.cc',
+ 'browser/prefs/tracked/pref_hash_calculator.h',
+ 'browser/prefs/tracked/pref_hash_filter.cc',
+ 'browser/prefs/tracked/pref_hash_filter.h',
+ 'browser/prefs/tracked/pref_hash_store.h',
+ 'browser/prefs/tracked/pref_hash_store_impl.cc',
+ 'browser/prefs/tracked/pref_hash_store_impl.h',
+ 'browser/prefs/tracked/pref_hash_store_transaction.h',
'browser/prefs/tracked/pref_service_hash_store_contents.cc',
'browser/prefs/tracked/pref_service_hash_store_contents.h',
'browser/prefs/tracked/segregated_pref_store.cc',
'browser/profiles/profile_manager.h',
'browser/profiles/profile_metrics.cc',
'browser/profiles/profile_metrics.h',
+ 'browser/profiles/profile_metrics_list.h',
'browser/profiles/profile_shortcut_manager_win.cc',
'browser/profiles/profile_shortcut_manager_win.h',
'browser/profiles/profile_window.cc',
'browser/profiles/startup_task_runner_service_factory.h',
'browser/profiles/storage_partition_descriptor.h',
'browser/remove_rows_table_model.h',
- 'browser/renderer_context_menu/context_menu_content_type_app_mode.cc',
- 'browser/renderer_context_menu/context_menu_content_type_app_mode.h',
- 'browser/renderer_context_menu/context_menu_content_type_extension_popup.cc',
- 'browser/renderer_context_menu/context_menu_content_type_extension_popup.h',
'browser/renderer_context_menu/context_menu_content_type_factory.cc',
'browser/renderer_context_menu/context_menu_content_type_factory.h',
'browser/renderer_context_menu/context_menu_content_type_panel.cc',
'browser/renderer_context_menu/context_menu_content_type_panel.h',
- 'browser/renderer_context_menu/context_menu_content_type_platform_app.cc',
- 'browser/renderer_context_menu/context_menu_content_type_platform_app.h',
'browser/renderer_context_menu/spellchecker_submenu_observer.h',
'browser/renderer_context_menu/spellchecker_submenu_observer_mac.cc',
'browser/renderer_host/chrome_render_message_filter.cc',
'browser/safe_browsing/safe_browsing_tab_observer.h',
'browser/safe_browsing/srt_global_error_win.cc',
'browser/safe_browsing/srt_global_error_win.h',
+ 'browser/search/contextual_search_policy_handler_android.cc',
+ 'browser/search/contextual_search_policy_handler_android.h',
'browser/search/contextual_search_promo_source_android.cc',
'browser/search/contextual_search_promo_source_android.h',
'browser/search/iframe_source.cc',
'browser/search/instant_service_factory.h',
'browser/search/instant_service_observer.cc',
'browser/search/instant_service_observer.h',
- 'browser/search/local_ntp_source.cc',
- 'browser/search/local_ntp_source.h',
'browser/search/most_visited_iframe_source.cc',
'browser/searuch/most_visited_iframe_source.h',
'browser/search/search.cc',
'browser/search/search.h',
- 'browser/search/suggestions/image_manager_impl.cc',
- 'browser/search/suggestions/image_manager_impl.h',
+ 'browser/search/suggestions/image_fetcher_impl.cc',
+ 'browser/search/suggestions/image_fetcher_impl.h',
'browser/search/suggestions/suggestions_service_factory.cc',
'browser/search/suggestions/suggestions_service_factory.h',
'browser/search/suggestions/suggestions_source.cc',
'browser/services/gcm/gcm_profile_service_factory.h',
'browser/services/gcm/push_messaging_application_id.cc',
'browser/services/gcm/push_messaging_application_id.h',
+ 'browser/services/gcm/push_messaging_constants.cc',
+ 'browser/services/gcm/push_messaging_constants.h',
'browser/services/gcm/push_messaging_infobar_delegate.cc',
'browser/services/gcm/push_messaging_infobar_delegate.h',
'browser/services/gcm/push_messaging_permission_context.cc',
'browser/services/gcm/push_messaging_service_impl.h',
'browser/sessions/base_session_service.cc',
'browser/sessions/base_session_service.h',
+ 'browser/sessions/base_session_service_commands.cc',
+ 'browser/sessions/base_session_service_commands.h',
+ 'browser/sessions/base_session_service_delegate_impl.cc',
+ 'browser/sessions/base_session_service_delegate_impl.h',
+ 'browser/sessions/base_session_service_delegate.h',
+ 'browser/sessions/session_service_commands.cc',
+ 'browser/sessions/session_service_commands.h',
'browser/sessions/session_data_deleter.cc',
'browser/sessions/session_data_deleter.h',
'browser/sessions/session_restore_android.cc',
'browser/signin/profile_oauth2_token_service_factory.h',
'browser/signin/screenlock_bridge.cc',
'browser/signin/screenlock_bridge.h',
+ 'browser/signin/signin_cookie_changed_subscription.cc',
+ 'browser/signin/signin_cookie_changed_subscription.h',
'browser/signin/signin_manager_factory.cc',
'browser/signin/signin_manager_factory.h',
'browser/signin/signin_names_io_thread.cc',
'browser/signin/signin_header_helper.h',
'browser/signin/signin_tracker_factory.cc',
'browser/signin/signin_tracker_factory.h',
- 'browser/signin/signin_promo.cc',
- 'browser/signin/signin_promo.h',
'browser/site_details.cc',
'browser/site_details.h',
'browser/speech/chrome_speech_recognition_manager_delegate.cc',
'browser/media_galleries/fileapi/iphoto_file_util.cc',
'browser/media_galleries/fileapi/iphoto_file_util.h',
],
+ # Sources used by Mac and iOS.
+ 'chrome_browser_mac_ios_sources': [
+ 'browser/mac/handoff_utility.h',
+ 'browser/mac/handoff_utility.mm',
+ ],
# Sources (generally "desktop OS importers") used only on Mac & Windows.
'chrome_browser_win_mac_sources': [
'browser/media_galleries/fileapi/iapps_data_provider.cc',
'browser/infobars/infobar_extension_api.h',
'browser/metrics/extensions_metrics_provider.cc',
'browser/metrics/extensions_metrics_provider.h',
+ 'browser/renderer_context_menu/context_menu_content_type_app_mode.cc',
+ 'browser/renderer_context_menu/context_menu_content_type_app_mode.h',
+ 'browser/renderer_context_menu/context_menu_content_type_extension_popup.cc',
+ 'browser/renderer_context_menu/context_menu_content_type_extension_popup.h',
+ 'browser/renderer_context_menu/context_menu_content_type_platform_app.cc',
+ 'browser/renderer_context_menu/context_menu_content_type_platform_app.h',
'browser/renderer_host/chrome_extension_message_filter.cc',
'browser/renderer_host/chrome_extension_message_filter.h',
'browser/safe_json_parser.cc',
'browser/safe_json_parser.h',
+ 'browser/search/hotword_audio_history_handler.cc',
+ 'browser/search/hotword_audio_history_handler.h',
'browser/search/hotword_client.h',
'browser/search/hotword_service.cc',
'browser/search/hotword_service.h',
'browser/notifications/message_center_notification_manager_win.cc',
'browser/notifications/notification.cc',
'browser/notifications/notification.h',
+ 'browser/notifications/profile_notification.cc',
+ 'browser/notifications/profile_notification.h',
'browser/notifications/screen_lock_notification_blocker.cc',
'browser/notifications/screen_lock_notification_blocker.h',
'browser/notifications/fullscreen_notification_blocker.cc',
'browser/notifications/fullscreen_notification_blocker.h',
'browser/notifications/login_state_notification_blocker_chromeos.cc',
'browser/notifications/login_state_notification_blocker_chromeos.h',
- 'browser/notifications/notification_delegate.cc',
'browser/notifications/notification_delegate.h',
'browser/notifications/notification_object_proxy.cc',
'browser/notifications/notification_object_proxy.h',
- 'browser/notifications/notification_system_observer.cc',
- 'browser/notifications/notification_system_observer.h',
'browser/notifications/notification_ui_manager.h',
'browser/notifications/notification_ui_manager_android.cc',
'browser/notifications/notification_ui_manager_android.h',
'browser/notifications/message_center_stats_collector.h',
'browser/notifications/notification_conversion_helper.h',
'browser/notifications/notification_conversion_helper.cc',
+ 'browser/notifications/notification_system_observer.cc',
+ 'browser/notifications/notification_system_observer.h',
'browser/notifications/notification_ui_manager_desktop.cc',
'browser/notifications/sync_notifier/chrome_notifier_service.cc',
'browser/notifications/sync_notifier/chrome_notifier_service_factory.cc',
'browser/themes/theme_syncable_service.cc',
'browser/themes/theme_syncable_service.h',
],
- # Used both when enable_printing == 1 (full) and == 2 (basic)
+ # Used both when (enable_basic_printing==1 or enable_print_preview==1).
'chrome_browser_basic_printing_sources': [
'browser/printing/print_job.cc',
'browser/printing/print_job.h',
'browser/printing/printing_message_filter.cc',
'browser/printing/printing_message_filter.h',
],
- # Used on top of the "basic" sources when enable_printing == 1 (full).
+ # Used on top of the "basic" sources when enable_print_preview==1.
'chrome_browser_full_printing_sources': [
'browser/local_discovery/pwg_raster_converter.cc',
'browser/local_discovery/pwg_raster_converter.h',
'browser/task_manager/printing_information.cc',
'browser/task_manager/printing_information.h',
],
- # Used only in basic printing (enable_printing == 2) mode.
+ # Used only in (enable_basic_printing==1 and enable_print_preview==0) mode.
'chrome_browser_basic_only_printing_sources': [
'browser/printing/print_view_manager_basic.cc',
'browser/printing/print_view_manager_basic.h',
'browser/sessions/session_service.h',
'browser/sessions/session_service_factory.cc',
'browser/sessions/session_service_factory.h',
+ 'browser/sessions/session_service_utils.cc',
+ 'browser/sessions/session_service_utils.h',
],
'chrome_browser_android_sources': [
'browser/metrics/android_metrics_provider.cc',
'browser/media/protected_media_identifier_permission_context.h',
'browser/media/protected_media_identifier_permission_context_factory.cc',
'browser/media/protected_media_identifier_permission_context_factory.h',
+ 'browser/password_manager/generated_password_saved_infobar_delegate_android.cc',
+ 'browser/password_manager/generated_password_saved_infobar_delegate_android.h',
],
# Used everywhere but Android.
'chrome_browser_non_android_sources': [
'browser/accessibility/accessibility_events.h',
'browser/accessibility/accessibility_extension_api_constants.cc',
'browser/accessibility/accessibility_extension_api_constants.h',
+ 'browser/accessibility/ax_tree_id_registry.cc',
+ 'browser/accessibility/ax_tree_id_registry.h',
'browser/accessibility/invert_bubble_prefs.cc',
'browser/accessibility/invert_bubble_prefs.h',
'browser/auto_launch_trial.cc',
'browser/first_run/try_chrome_dialog_view.cc',
'browser/first_run/try_chrome_dialog_view.h',
'browser/first_run/upgrade_util.cc',
+ 'browser/google/did_run_updater_win.cc',
+ 'browser/google/did_run_updater_win.h',
'browser/hang_monitor/hang_crash_dump_win.cc',
'browser/hang_monitor/hang_crash_dump_win.h',
'browser/hang_monitor/hung_plugin_action.cc',
'browser/chrome_browser_field_trials_desktop.h',
'browser/chrome_device_client.cc',
'browser/chrome_device_client.h',
+ 'browser/chrome_page_zoom.cc',
+ 'browser/chrome_page_zoom.h',
+ 'browser/chrome_page_zoom_constants.cc',
+ 'browser/chrome_page_zoom_constants.h',
+ 'browser/power/process_power_collector.cc',
+ 'browser/power/process_power_collector.h',
+ 'browser/search/local_ntp_source.cc',
+ 'browser/search/local_ntp_source.h',
+ 'browser/signin/signin_promo.cc',
+ 'browser/signin/signin_promo.h',
+ ],
+ # Everything but Android, iOS, and CrOS.
+ 'chrome_browser_desktop_sources': [
+ 'browser/profiles/avatar_menu_desktop.cc',
+ 'browser/profiles/avatar_menu_observer.h',
+ 'browser/profiles/avatar_menu_actions_desktop.cc',
+ 'browser/profiles/avatar_menu_actions_desktop.h',
+ 'browser/profiles/profile_list_desktop.cc',
+ 'browser/profiles/profile_list_desktop.h',
],
'chrome_browser_supervised_user_sources': [
'browser/supervised_user/custodian_profile_downloader_service.cc',
'browser/supervised_user/custodian_profile_downloader_service.h',
'browser/supervised_user/custodian_profile_downloader_service_factory.cc',
'browser/supervised_user/custodian_profile_downloader_service_factory.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_blacklist_downloader.cc',
'browser/safe_browsing/incident_reporting/delayed_analysis_callback.h',
'browser/safe_browsing/incident_reporting/delayed_callback_runner.cc',
'browser/safe_browsing/incident_reporting/delayed_callback_runner.h',
+ 'browser/safe_browsing/incident_reporting/download_metadata_manager.cc',
+ 'browser/safe_browsing/incident_reporting/download_metadata_manager.h',
'browser/safe_browsing/incident_reporting/environment_data_collection.cc',
'browser/safe_browsing/incident_reporting/environment_data_collection.h',
'browser/safe_browsing/incident_reporting/environment_data_collection_win.cc',
],
# Used everywhere but ChromeOS.
'chrome_browser_non_chromeos_sources': [
- # TODO(brettw) it's suspicious that these _desktop.cc files are compiled
- # for Android. We should test removing them on Android.
- 'browser/profiles/avatar_menu_desktop.cc',
- 'browser/profiles/avatar_menu_observer.h',
- 'browser/profiles/avatar_menu_actions_desktop.cc',
- 'browser/profiles/avatar_menu_actions_desktop.h',
- 'browser/profiles/profile_list_desktop.cc',
- 'browser/profiles/profile_list_desktop.h',
'browser/signin/signin_global_error.cc',
'browser/signin/signin_global_error.h',
'browser/signin/signin_global_error_factory.cc',
'android/java/src/org/chromium/chrome/browser/autofill/AutofillDialogResult.java',
'android/java/src/org/chromium/chrome/browser/autofill/AutofillLogger.java',
'android/java/src/org/chromium/chrome/browser/autofill/AutofillPopupBridge.java',
+ 'android/java/src/org/chromium/chrome/browser/autofill/PasswordGenerationPopupBridge.java',
'android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java',
'android/java/src/org/chromium/chrome/browser/BookmarksBridge.java',
- 'android/java/src/org/chromium/chrome/browser/BrowserVersion.java',
'android/java/src/org/chromium/chrome/browser/banners/AppBannerManager.java',
'android/java/src/org/chromium/chrome/browser/CertificateViewer.java',
'android/java/src/org/chromium/chrome/browser/ChromiumApplication.java',
'android/java/src/org/chromium/chrome/browser/dom_distiller/DomDistillerTabUtils.java',
'android/java/src/org/chromium/chrome/browser/EnhancedBookmarksBridge.java',
'android/java/src/org/chromium/chrome/browser/favicon/FaviconHelper.java',
+ 'android/java/src/org/chromium/chrome/browser/findinpage/FindInPageBridge.java',
'android/java/src/org/chromium/chrome/browser/ForeignSessionHelper.java',
'android/java/src/org/chromium/chrome/browser/LogoBridge.java',
'android/java/src/org/chromium/chrome/browser/NewTabPagePrefs.java',
'android/java/src/org/chromium/chrome/browser/JavascriptAppModalDialog.java',
'android/java/src/org/chromium/chrome/browser/NavigationPopup.java',
'android/java/src/org/chromium/chrome/browser/net/spdyproxy/DataReductionProxySettings.java',
+ 'android/java/src/org/chromium/chrome/browser/NotificationUIManager.java',
'android/java/src/org/chromium/chrome/browser/omnibox/AnswersImage.java',
'android/java/src/org/chromium/chrome/browser/omnibox/AutocompleteController.java',
'android/java/src/org/chromium/chrome/browser/omnibox/OmniboxPrerender.java',
'android/java/src/org/chromium/chrome/browser/omnibox/OmniboxViewUtil.java',
'android/java/src/org/chromium/chrome/browser/password_manager/PasswordAuthenticationManager.java',
'android/java/src/org/chromium/chrome/browser/PasswordUIView.java',
+ 'android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java',
'android/java/src/org/chromium/chrome/browser/profiles/MostVisitedSites.java',
'android/java/src/org/chromium/chrome/browser/profiles/Profile.java',
'android/java/src/org/chromium/chrome/browser/profiles/ProfileDownloader.java',
'android/java/src/org/chromium/chrome/browser/signin/OAuth2TokenService.java',
'android/java/src/org/chromium/chrome/browser/signin/SigninManager.java',
'android/java/src/org/chromium/chrome/browser/sync/ProfileSyncService.java',
- 'android/java/src/org/chromium/chrome/browser/tabmodel/TabModelBase.java',
+ 'android/java/src/org/chromium/chrome/browser/tabmodel/TabModelJniBridge.java',
'android/java/src/org/chromium/chrome/browser/Tab.java',
+ 'android/java/src/org/chromium/chrome/browser/TabState.java',
'android/java/src/org/chromium/chrome/browser/TtsPlatformImpl.java',
'android/java/src/org/chromium/chrome/browser/UmaBridge.java',
'android/java/src/org/chromium/chrome/browser/UmaUtils.java',
'android/java/src/org/chromium/chrome/browser/util/FeatureUtilities.java',
'android/java/src/org/chromium/chrome/browser/VoiceSearchTabHelper.java',
'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java',
+ 'android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java',
'android/java/src/org/chromium/chrome/browser/infobar/AutoLoginDelegate.java',
'android/java/src/org/chromium/chrome/browser/infobar/ConfirmInfoBarDelegate.java',
'android/java/src/org/chromium/chrome/browser/infobar/DataReductionProxyInfoBarDelegate.java',
+ 'android/java/src/org/chromium/chrome/browser/infobar/GeneratedPasswordSavedInfoBarDelegate.java',
'android/java/src/org/chromium/chrome/browser/infobar/InfoBar.java',
'android/java/src/org/chromium/chrome/browser/infobar/InfoBarContainer.java',
- 'android/java/src/org/chromium/chrome/browser/infobar/SavePasswordInfoBarDelegate.java',
'android/java/src/org/chromium/chrome/browser/infobar/TranslateInfoBarDelegate.java',
- 'android/java/src/org/chromium/chrome/browser/invalidation/InvalidationController.java',
+ 'android/java/src/org/chromium/chrome/browser/invalidation/InvalidationServiceFactory.java',
'android/java/src/org/chromium/chrome/browser/toolbar/ToolbarModel.java'
],
},
'../components/components.gyp:content_settings_core_browser',
'../components/components.gyp:content_settings_core_common',
'../components/components.gyp:crx_file',
- '../components/components.gyp:data_reduction_proxy_browser',
+ '../components/components.gyp:data_reduction_proxy_core_browser',
'../components/components.gyp:domain_reliability',
+ '../components/components.gyp:enhanced_bookmarks',
'../components/components.gyp:favicon_base',
'../components/components.gyp:favicon_core',
'../components/components.gyp:feedback_component',
'sources': [
'<@(chrome_browser_undo_sources)',
],
+ 'includes': [
+ # Disable LTO due to ELF section name out of range
+ # crbug.com/422251
+ '../build/android/disable_lto.gypi',
+ ],
'conditions': [
['OS != "ios"', {
'dependencies': [
'../components/components.gyp:password_manager_content_browser',
'../components/components.gyp:power',
'../components/components.gyp:precache_content',
- '../components/components.gyp:sessions',
+ '../components/components.gyp:sessions_content',
'../components/components.gyp:storage_monitor',
'../components/components.gyp:translate_content_browser',
'../components/components.gyp:url_matcher',
'../content/app/resources/content_resources.gyp:content_resources',
'../media/cast/cast.gyp:cast_net',
'../media/media.gyp:media',
+ '../mojo/edk/mojo_edk.gyp:mojo_system_impl',
'../mojo/mojo_base.gyp:mojo_common_lib',
- '../mojo/mojo_base.gyp:mojo_cpp_bindings',
'../mojo/mojo_base.gyp:mojo_environment_chromium',
- '../mojo/mojo_base.gyp:mojo_js_bindings',
- '../mojo/mojo_base.gyp:mojo_system_impl',
+ '../mojo/public/mojo_public.gyp:mojo_cpp_bindings',
+ '../mojo/public/mojo_public.gyp:mojo_js_bindings',
'../net/net.gyp:net_extras',
'../net/net.gyp:net_with_v8',
'../storage/storage_browser.gyp:storage',
],
'sources': [ '<@(chrome_browser_mac_sources)' ]
}],
+ ['OS=="mac" or OS=="ios"', {
+ 'sources': [ '<@(chrome_browser_mac_ios_sources)' ]
+ }],
['chromeos==1 or OS=="ios"', {
'sources!': [
'browser/metrics/signin_status_metrics_provider.cc',
'browser/metrics/signin_status_metrics_provider.h',
],
}],
- ['toolkit_views==1', {
- 'dependencies': [
- '../components/components.gyp:native_app_window',
- ],
- }],
['enable_extensions==1', {
'dependencies': [
'browser_extensions',
'sources': [ '<@(chrome_browser_themes_sources)' ],
}],
# Some form of printing support.
- ['enable_printing!=0', {
+ ['enable_basic_printing==1 or enable_print_preview==1', {
'dependencies': [
'../printing/printing.gyp:printing',
],
['OS=="win"', {
'sources': [ '<@(chrome_browser_printing_emf_sources)' ],
}],
- # Full printing on top of the above.
- ['enable_printing==1', {
- 'sources': [ '<@(chrome_browser_full_printing_sources)' ],
- }],
- # Partial-only printing support.
- ['enable_printing==2', {
- 'sources': [ '<@(chrome_browser_basic_only_printing_sources)' ],
- }],
],
}],
+ # Full printing on top of the above.
+ ['enable_print_preview==1', {
+ 'sources': [ '<@(chrome_browser_full_printing_sources)' ],
+ }],
+ # Partial-only printing support.
+ ['enable_basic_printing==1 and enable_print_preview==0', {
+ 'sources': [ '<@(chrome_browser_basic_only_printing_sources)' ],
+ }],
['enable_captive_portal_detection==1', {
'sources': [ '<@(chrome_browser_captive_portal_sources)' ]
}],
['enable_session_service==1', {
'sources': [ '<@(chrome_browser_session_service_sources)' ],
}],
+ ['OS!="android" and OS!="ios" and chromeos==0', {
+ 'sources': [ '<@(chrome_browser_desktop_sources)' ],
+ }],
['OS=="android" or OS=="ios"', {
'sources': [ '<@(chrome_browser_mobile_sources)' ],
}, { # OS!="android" and OS!="ios"
'../components/components.gyp:enhanced_bookmarks',
'../components/components.gyp:history_core_android',
'../components/components.gyp:web_contents_delegate_android',
+ '../components/components_resources.gyp:components_resources',
'../third_party/android_opengl/etc1/etc1.gyp:etc1',
'chrome_browser_jni_headers',
],
'<(allocator_target)',
],
}],
+ ['branding!="Chrome"', {
+ 'sources!': [
+ 'browser/google/did_run_updater_win.cc',
+ 'browser/google/did_run_updater_win.h',
+ ],
+ }],
],
}, { # 'OS!="win"
'sources': [ '<@(chrome_browser_non_win_sources)' ],
['use_x11==1', {
'dependencies': [
'../build/linux/system.gyp:x11',
+ '../ui/events/devices/events_devices.gyp:events_devices',
'../ui/gfx/x/gfx_x11.gyp:gfx_x11',
],
}],
}],
['enable_managed_users==1', {
'sources': [ '<@(chrome_browser_supervised_user_sources)' ],
- 'conditions' : [
- [ 'use_ash==1', {
- 'dependencies': [
- '<(DEPTH)/components/components.gyp:user_manager',
- ]
- }]
- ]
}],
['enable_webrtc==1', {
'sources': [ '<@(chrome_browser_webrtc_sources)' ]
['OS=="android"', {
'targets': [
{
+ # GN: //chrome/browser:jni_headers
'target_name': 'chrome_browser_jni_headers',
'type': 'none',
'sources': [ '<@(chrome_browser_jni_sources)' ],
'includes': [ '../build/jni_generator.gypi' ],
},
{
+ # GN: //chrome/android:chrome_android_java_enums_srcjar
'target_name': 'activity_type_ids_java',
'type': 'none',
- 'sources': [
- 'android/java/ActivityTypeIds.template',
- ],
'variables': {
- 'package_name': 'org/chromium/chrome/browser',
- 'template_deps': ['browser/android/activity_type_id_list.h'],
+ 'source_file': 'browser/android/activity_type_ids.h',
},
- 'includes': [ '../build/android/java_cpp_template.gypi' ],
+ 'includes': [ '../build/android/java_cpp_enum.gypi' ],
},
{
+ # GN: //chrome/android:app_banner_metrics_ids_javagen
'target_name': 'app_banner_metrics_ids_java',
'type': 'none',
'sources': [
'includes': [ '../build/android/java_cpp_template.gypi' ],
},
{
+ # GN: //chrome/android:resource_id_javagen
'target_name': 'resource_id_java',
'type': 'none',
'sources': [
'includes': [ '../build/android/java_cpp_template.gypi' ],
},
{
+ # GN: //chrome/android:chrome_android_java_enums_srcjar
+ 'target_name': 'profile_account_management_metrics_java',
+ 'type': 'none',
+ 'variables': {
+ 'source_file': 'browser/profiles/profile_metrics.h',
+ },
+ 'includes': [ '../build/android/java_cpp_enum.gypi' ],
+ },
+ {
+ # GN: //chrome/android:chrome_android_java_enums_srcjar
'target_name': 'profile_sync_service_model_type_selection_java',
'type': 'none',
- 'sources': [
- 'android/java/ModelTypeSelection.template',
- ],
'variables': {
- 'package_name': 'org/chromium/chrome/browser/sync',
- 'template_deps': ['browser/sync/profile_sync_service_model_type_selection_android.h'],
+ 'source_file': 'browser/sync/profile_sync_service_android.cc',
},
- 'includes': [ '../build/android/java_cpp_template.gypi' ],
+ 'includes': [ '../build/android/java_cpp_enum.gypi' ],
},
{
+ # GN: //chrome/android:chrome_android_java_enums_srcjar
'target_name': 'toolbar_model_security_levels_java',
'type': 'none',
- 'sources': [
- 'android/java/ToolbarModelSecurityLevel.template',
- ],
'variables': {
- 'package_name': 'org/chromium/chrome/browser/ui/toolbar',
- 'template_deps': ['browser/ui/toolbar/toolbar_model_security_level_list.h'],
+ 'source_file': 'browser/ui/toolbar/toolbar_model.h',
},
- 'includes': [ '../build/android/java_cpp_template.gypi' ],
+ 'includes': [ '../build/android/java_cpp_enum.gypi' ],
},
{
+ # GN: //chrome/android:chrome_android_java_enums_srcjar
'target_name': 'tab_load_status_java',
'type': 'none',
- 'sources': [
- 'android/java/TabLoadStatus.template',
- ],
'variables': {
- 'package_name': 'org/chromium/chrome/browser',
- 'template_deps': ['browser/android/tab_load_status.h'],
+ 'source_file': 'browser/android/tab_android.h',
},
- 'includes': [ '../build/android/java_cpp_template.gypi' ],
+ 'includes': [ '../build/android/java_cpp_enum.gypi' ],
},
],
},],
projects / platform / framework / web / crosswalk.git / blobdiff