Skip to content

GitLab

T
tangled
Commit 7cd35130 authored by Nico Weber's avatar Nico Weber Committed by Commit Bot
Browse files
Options

Remove another use of mac_views_browser, consolidate gn file a bit. 

Merges the contents of an always-true block with the contents one scope up.
There were several if (is_win) etc blocks at that scope; merge these too.

No intended behavior change.

Bug: 832676
Change-Id: I89ecdec3babec570c631714001edb71cfb1cca66
Reviewed-on: https://chromium-review.googlesource.com/1213522Reviewed-by: default avatarElly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#589519}
parent d9802ae7
Hide whitespace changes
Inline Side-by-side
Showing with 331 additions and 358 deletions
chrome/browser/ui/BUILD.gn
View file @ 7cd35130
......@@ -2739,6 +2739,8 @@ jumbo_split_static_library("ui") {
# This test header is included because it contains forward declarations
# needed for "friend" statements for use in tests.
"translate/translate_bubble_test_utils.h",
"views/accessibility/invert_bubble_view.cc",
"views/accessibility/invert_bubble_view.h",
"views/accessibility/non_accessible_image_view.cc",
"views/accessibility/non_accessible_image_view.h",
"views/apps/app_info_dialog/app_info_dialog_container.cc",
......@@ -2769,10 +2771,14 @@ jumbo_split_static_library("ui") {
"views/autofill/local_card_migration_bubble_views.h",
"views/autofill/local_card_migration_dialog_view.cc",
"views/autofill/local_card_migration_dialog_view.h",
"views/autofill/local_card_migration_icon_view.cc",
"views/autofill/local_card_migration_icon_view.h",
"views/autofill/migratable_card_view.cc",
"views/autofill/migratable_card_view.h",
"views/autofill/save_card_bubble_views.cc",
"views/autofill/save_card_bubble_views.h",
"views/autofill/save_card_icon_view.cc",
"views/autofill/save_card_icon_view.h",
"views/autofill/save_card_manage_cards_bubble_views.cc",
"views/autofill/save_card_manage_cards_bubble_views.h",
"views/autofill/save_card_offer_bubble_views.cc",
......@@ -2781,13 +2787,30 @@ jumbo_split_static_library("ui") {
"views/autofill/save_card_sign_in_promo_bubble_views.h",
"views/autofill/view_util.cc",
"views/autofill/view_util.h",
"views/bookmarks/bookmark_bar_instructions_view.cc",
"views/bookmarks/bookmark_bar_instructions_view.h",
"views/bookmarks/bookmark_bar_view.cc",
"views/bookmarks/bookmark_bar_view.h",
"views/bookmarks/bookmark_bar_view_observer.h",
"views/bookmarks/bookmark_bubble_view.cc",
"views/bookmarks/bookmark_bubble_view.h",
"views/bookmarks/bookmark_context_menu.cc",
"views/bookmarks/bookmark_context_menu.h",
"views/bookmarks/bookmark_drag_drop_views.cc",
"views/bookmarks/bookmark_editor_view.cc",
"views/bookmarks/bookmark_editor_view.h",
"views/bookmarks/bookmark_menu_controller_observer.h",
"views/bookmarks/bookmark_menu_controller_views.cc",
"views/bookmarks/bookmark_menu_controller_views.h",
"views/bookmarks/bookmark_menu_delegate.cc",
"views/bookmarks/bookmark_menu_delegate.h",
"views/browser_dialogs_views.cc",
"views/bubble_anchor_util_views.cc",
"views/bubble_anchor_util_views.h",
"views/bulleted_label_list_view.cc",
"views/bulleted_label_list_view.h",
"views/certificate_selector.cc",
"views/certificate_selector.h",
"views/chrome_browser_main_extra_parts_views.cc",
"views/chrome_browser_main_extra_parts_views.h",
"views/chrome_constrained_window_views_client.cc",
......@@ -2802,10 +2825,12 @@ jumbo_split_static_library("ui") {
"views/chrome_typography_provider.h",
"views/chrome_views_delegate.cc",
"views/chrome_views_delegate.h",
"views/chrome_web_dialog_view.cc",
"views/collected_cookies_views.cc",
"views/collected_cookies_views.h",
"views/confirm_bubble_views.cc",
"views/confirm_bubble_views.h",
"views/constrained_web_dialog_delegate_views.cc",
"views/content_setting_bubble_contents.cc",
"views/content_setting_bubble_contents.h",
"views/content_setting_domain_list_view.cc",
......@@ -2815,6 +2840,20 @@ jumbo_split_static_library("ui") {
"views/device_chooser_content_view.cc",
"views/device_chooser_content_view.h",
"views/download/download_danger_prompt_views.cc",
"views/download/download_feedback_dialog_view.cc",
"views/download/download_feedback_dialog_view.h",
"views/download/download_in_progress_dialog_view.cc",
"views/download/download_in_progress_dialog_view.h",
"views/download/download_item_view.cc",
"views/download/download_item_view.h",
"views/download/download_shelf_context_menu_view.cc",
"views/download/download_shelf_context_menu_view.h",
"views/download/download_shelf_view.cc",
"views/download/download_shelf_view.h",
"views/download/download_started_animation_views.cc",
"views/dropdown_bar_host.cc",
"views/dropdown_bar_host.h",
"views/dropdown_bar_host_delegate.h",
"views/elevation_icon_setter.cc",
"views/elevation_icon_setter.h",
"views/exclusive_access_bubble_views.cc",
......@@ -2835,8 +2874,68 @@ jumbo_split_static_library("ui") {
"views/extensions/pwa_confirmation_view.h",
"views/extensions/web_app_info_image_source.cc",
"views/extensions/web_app_info_image_source.h",
"views/feature_promos/bookmark_promo_bubble_view.cc",
"views/feature_promos/bookmark_promo_bubble_view.h",
"views/feature_promos/feature_promo_bubble_view.cc",
"views/feature_promos/feature_promo_bubble_view.h",
"views/feature_promos/incognito_window_promo_bubble_view.cc",
"views/feature_promos/incognito_window_promo_bubble_view.h",
"views/feature_promos/new_tab_promo_bubble_view.cc",
"views/feature_promos/new_tab_promo_bubble_view.h",
"views/find_bar_host.cc",
"views/find_bar_host.h",
"views/find_bar_view.cc",
"views/find_bar_view.h",
"views/folder_upload_confirmation_view.cc",
"views/folder_upload_confirmation_view.h",
"views/frame/app_menu_button.cc",
"views/frame/app_menu_button.h",
"views/frame/avatar_button_manager.cc",
"views/frame/avatar_button_manager.h",
"views/frame/browser_frame.cc",
"views/frame/browser_frame.h",
"views/frame/browser_non_client_frame_view.cc",
"views/frame/browser_non_client_frame_view.h",
"views/frame/browser_root_view.cc",
"views/frame/browser_root_view.h",
"views/frame/browser_view.cc",
"views/frame/browser_view.h",
"views/frame/browser_view_commands_mac.h",
"views/frame/browser_view_commands_mac.mm",
"views/frame/browser_view_layout.cc",
"views/frame/browser_view_layout.h",
"views/frame/browser_view_layout_delegate.h",
"views/frame/browser_window_factory.cc",
"views/frame/contents_layout_manager.cc",
"views/frame/contents_layout_manager.h",
"views/frame/contents_web_view.cc",
"views/frame/contents_web_view.h",
"views/frame/hosted_app_button_container.cc",
"views/frame/hosted_app_button_container.h",
"views/frame/hosted_app_menu_button.cc",
"views/frame/hosted_app_menu_button.h",
"views/frame/hosted_app_origin_text.cc",
"views/frame/hosted_app_origin_text.h",
"views/frame/immersive_mode_controller.cc",
"views/frame/immersive_mode_controller.h",
"views/frame/immersive_mode_controller_factory_views.cc",
"views/frame/immersive_mode_controller_stub.cc",
"views/frame/immersive_mode_controller_stub.h",
"views/frame/native_browser_frame.h",
"views/frame/native_browser_frame_factory.cc",
"views/frame/native_browser_frame_factory.h",
"views/frame/system_menu_model_builder.cc",
"views/frame/system_menu_model_builder.h",
"views/frame/system_menu_model_delegate.cc",
"views/frame/system_menu_model_delegate.h",
"views/frame/toolbar_button_provider.h",
"views/frame/top_container_view.cc",
"views/frame/top_container_view.h",
"views/frame/top_controls_slide_controller.cc",
"views/frame/top_controls_slide_controller.h",
"views/frame/web_contents_close_handler.cc",
"views/frame/web_contents_close_handler.h",
"views/frame/web_contents_close_handler_delegate.h",
"views/fullscreen_control/fullscreen_control_host.cc",
"views/fullscreen_control/fullscreen_control_host.h",
"views/fullscreen_control/fullscreen_control_popup.cc",
......@@ -2847,10 +2946,44 @@ jumbo_split_static_library("ui") {
"views/global_error_bubble_view.h",
"views/hover_button.cc",
"views/hover_button.h",
"views/hung_renderer_view.cc",
"views/hung_renderer_view.h",
"views/ime/ime_warning_bubble_view.cc",
"views/ime/ime_warning_bubble_view.h",
"views/importer/import_lock_dialog_view.cc",
"views/importer/import_lock_dialog_view.h",
"views/infobars/alternate_nav_infobar_view.cc",
"views/infobars/alternate_nav_infobar_view.h",
"views/infobars/confirm_infobar.cc",
"views/infobars/confirm_infobar.h",
"views/infobars/infobar_container_view.cc",
"views/infobars/infobar_container_view.h",
"views/infobars/infobar_view.cc",
"views/infobars/infobar_view.h",
"views/load_complete_listener.cc",
"views/load_complete_listener.h",
"views/location_bar/background_with_1_px_border.cc",
"views/location_bar/background_with_1_px_border.h",
"views/location_bar/content_setting_image_view.cc",
"views/location_bar/content_setting_image_view.h",
"views/location_bar/find_bar_icon.cc",
"views/location_bar/find_bar_icon.h",
"views/location_bar/icon_label_bubble_view.cc",
"views/location_bar/icon_label_bubble_view.h",
"views/location_bar/keyword_hint_view.cc",
"views/location_bar/keyword_hint_view.h",
"views/location_bar/location_bar_bubble_delegate_view.cc",
"views/location_bar/location_bar_bubble_delegate_view.h",
"views/location_bar/location_bar_layout.cc",
"views/location_bar/location_bar_layout.h",
"views/location_bar/location_bar_view.cc",
"views/location_bar/location_bar_view.h",
"views/location_bar/location_icon_view.cc",
"views/location_bar/location_icon_view.h",
"views/location_bar/selected_keyword_view.cc",
"views/location_bar/selected_keyword_view.h",
"views/location_bar/star_view.cc",
"views/location_bar/star_view.h",
"views/location_bar/zoom_bubble_view.cc",
"views/location_bar/zoom_bubble_view.h",
"views/login_handler_views.cc",
......@@ -2858,12 +2991,59 @@ jumbo_split_static_library("ui") {
"views/login_view.h",
"views/material_refresh_layout_provider.cc",
"views/material_refresh_layout_provider.h",
"views/media_router/cast_dialog_helper.cc",
"views/media_router/cast_dialog_helper.h",
"views/media_router/cast_dialog_metrics.cc",
"views/media_router/cast_dialog_metrics.h",
"views/media_router/cast_dialog_no_sinks_view.cc",
"views/media_router/cast_dialog_no_sinks_view.h",
"views/media_router/cast_dialog_sink_button.cc",
"views/media_router/cast_dialog_sink_button.h",
"views/media_router/cast_dialog_view.cc",
"views/media_router/cast_dialog_view.h",
"views/media_router/cast_toolbar_button.cc",
"views/media_router/cast_toolbar_button.h",
"views/media_router/cloud_services_dialog_view.cc",
"views/media_router/cloud_services_dialog_view.h",
"views/media_router/media_remoting_dialog_view.cc",
"views/media_router/media_remoting_dialog_view.h",
"views/media_router/media_router_dialog_controller_views.cc",
"views/media_router/media_router_dialog_controller_views.h",
"views/media_router/media_router_views_ui.cc",
"views/media_router/media_router_views_ui.h",
"views/media_router/presentation_receiver_window_factory.cc",
"views/media_router/presentation_receiver_window_frame.cc",
"views/media_router/presentation_receiver_window_frame.h",
"views/media_router/presentation_receiver_window_view.cc",
"views/media_router/presentation_receiver_window_view.h",
"views/media_router/web_contents_display_observer_view.cc",
"views/media_router/web_contents_display_observer_view.h",
"views/omnibox/omnibox_match_cell_view.cc",
"views/omnibox/omnibox_match_cell_view.h",
"views/omnibox/omnibox_popup_contents_view.cc",
"views/omnibox/omnibox_popup_contents_view.h",
"views/omnibox/omnibox_result_view.cc",
"views/omnibox/omnibox_result_view.h",
"views/omnibox/omnibox_tab_switch_button.cc",
"views/omnibox/omnibox_tab_switch_button.h",
"views/omnibox/omnibox_text_view.cc",
"views/omnibox/omnibox_text_view.h",
"views/omnibox/omnibox_view_views.cc",
"views/omnibox/omnibox_view_views.h",
"views/omnibox/rounded_omnibox_results_frame.cc",
"views/omnibox/rounded_omnibox_results_frame.h",
"views/overlay/close_image_button.cc",
"views/overlay/close_image_button.h",
"views/overlay/control_image_button.cc",
"views/overlay/control_image_button.h",
"views/overlay/overlay_window_views.cc",
"views/overlay/overlay_window_views.h",
"views/page_action/page_action_icon_container_view.cc",
"views/page_action/page_action_icon_container_view.h",
"views/page_action/page_action_icon_view.cc",
"views/page_action/page_action_icon_view.h",
"views/page_action/zoom_view.cc",
"views/page_action/zoom_view.h",
"views/page_info/chosen_object_view.cc",
"views/page_info/chosen_object_view.h",
"views/page_info/chosen_object_view_observer.h",
......@@ -2880,10 +3060,14 @@ jumbo_split_static_library("ui") {
"views/passwords/auto_signin_first_run_dialog_view.h",
"views/passwords/credentials_item_view.cc",
"views/passwords/credentials_item_view.h",
"views/passwords/manage_passwords_icon_views.cc",
"views/passwords/manage_passwords_icon_views.h",
"views/passwords/password_auto_sign_in_view.cc",
"views/passwords/password_auto_sign_in_view.h",
"views/passwords/password_bubble_view_base.cc",
"views/passwords/password_bubble_view_base.h",
"views/passwords/password_generation_popup_view_views.cc",
"views/passwords/password_generation_popup_view_views.h",
"views/passwords/password_items_view.cc",
"views/passwords/password_items_view.h",
"views/passwords/password_pending_view.cc",
......@@ -2937,8 +3121,19 @@ jumbo_split_static_library("ui") {
"views/payments/view_stack.h",
"views/permission_bubble/chooser_bubble_ui.cc",
"views/permission_bubble/chooser_bubble_ui.h",
"views/permission_bubble/chooser_bubble_ui_views.cc",
"views/permission_bubble/permission_prompt_impl.cc",
"views/permission_bubble/permission_prompt_impl.h",
"views/permission_bubble/permission_prompt_impl_views.cc",
"views/profiles/avatar_button_style.h",
"views/profiles/avatar_toolbar_button.cc",
"views/profiles/avatar_toolbar_button.h",
"views/profiles/profile_indicator_icon.cc",
"views/profiles/profile_indicator_icon.h",
"views/profiles/signin_view_controller_delegate_views.cc",
"views/profiles/signin_view_controller_delegate_views.h",
"views/proximity_auth/proximity_auth_error_bubble_view.cc",
"views/proximity_auth/proximity_auth_error_bubble_view.h",
"views/relaunch_notification/relaunch_notification_controller.cc",
"views/relaunch_notification/relaunch_notification_controller.h",
"views/relaunch_notification/relaunch_notification_metrics.cc",
......@@ -2949,28 +3144,95 @@ jumbo_split_static_library("ui") {
"views/relaunch_notification/relaunch_required_timer.h",
"views/relaunch_notification/relaunch_required_timer_internal.cc",
"views/relaunch_notification/relaunch_required_timer_internal.h",
"views/sad_tab_view.cc",
"views/sad_tab_view.h",
"views/safe_browsing/password_reuse_modal_warning_dialog.cc",
"views/safe_browsing/password_reuse_modal_warning_dialog.h",
"views/session_crashed_bubble_view.cc",
"views/session_crashed_bubble_view.h",
"views/simple_message_box_views.cc",
"views/simple_message_box_views.h",
"views/ssl_client_certificate_selector.cc",
"views/ssl_client_certificate_selector.h",
"views/status_bubble_views.cc",
"views/status_bubble_views.h",
"views/subtle_notification_view.cc",
"views/subtle_notification_view.h",
"views/sync/bubble_sync_promo_view.cc",
"views/sync/bubble_sync_promo_view.h",
"views/sync/profile_signin_confirmation_dialog_views.cc",
"views/sync/profile_signin_confirmation_dialog_views.h",
"views/tab_contents/chrome_web_contents_view_focus_helper.cc",
"views/tab_contents/chrome_web_contents_view_focus_helper.h",
"views/tab_dialogs_views.cc",
"views/tab_dialogs_views.h",
"views/tab_icon_view.cc",
"views/tab_icon_view.h",
"views/tab_modal_confirm_dialog_views.cc",
"views/tab_modal_confirm_dialog_views.h",
"views/tabs/alert_indicator_button.cc",
"views/tabs/alert_indicator_button.h",
"views/tabs/browser_tab_strip_controller.cc",
"views/tabs/browser_tab_strip_controller.h",
"views/tabs/glow_hover_controller.cc",
"views/tabs/glow_hover_controller.h",
"views/tabs/new_tab_button.cc",
"views/tabs/new_tab_button.h",
"views/tabs/stacked_tab_strip_layout.cc",
"views/tabs/stacked_tab_strip_layout.h",
"views/tabs/tab.cc",
"views/tabs/tab.h",
"views/tabs/tab_close_button.cc",
"views/tabs/tab_close_button.h",
"views/tabs/tab_controller.h",
"views/tabs/tab_drag_controller.cc",
"views/tabs/tab_drag_controller.h",
"views/tabs/tab_icon.cc",
"views/tabs/tab_icon.h",
"views/tabs/tab_strip.cc",
"views/tabs/tab_strip.h",
"views/tabs/tab_strip_controller.h",
"views/tabs/tab_strip_layout.cc",
"views/tabs/tab_strip_layout.h",
"views/tabs/window_finder.h",
"views/task_manager_view.cc",
"views/task_manager_view.h",
"views/textfield_layout.cc",
"views/textfield_layout.h",
"views/theme_copying_widget.cc",
"views/theme_copying_widget.h",
"views/toolbar/app_menu.cc",
"views/toolbar/app_menu.h",
"views/toolbar/app_menu_observer.h",
"views/toolbar/browser_actions_container.cc",
"views/toolbar/browser_actions_container.h",
"views/toolbar/browser_app_menu_button.cc",
"views/toolbar/browser_app_menu_button.h",
"views/toolbar/extension_toolbar_menu_view.cc",
"views/toolbar/extension_toolbar_menu_view.h",
"views/toolbar/home_button.cc",
"views/toolbar/home_button.h",
"views/toolbar/media_router_action_platform_delegate_views.cc",
"views/toolbar/media_router_action_platform_delegate_views.h",
"views/toolbar/reload_button.cc",
"views/toolbar/reload_button.h",
"views/toolbar/toolbar_action_view.cc",
"views/toolbar/toolbar_action_view.h",
"views/toolbar/toolbar_action_view_delegate_views.h",
"views/toolbar/toolbar_actions_bar_bubble_views.cc",
"views/toolbar/toolbar_actions_bar_bubble_views.h",
"views/toolbar/toolbar_button.cc",
"views/toolbar/toolbar_button.h",
"views/toolbar/toolbar_ink_drop_util.cc",
"views/toolbar/toolbar_ink_drop_util.h",
"views/toolbar/toolbar_view.cc",
"views/toolbar/toolbar_view.h",
"views/touch_uma/touch_uma.cc",
"views/touch_uma/touch_uma.h",
"views/translate/translate_bubble_view.cc",
"views/translate/translate_bubble_view.h",
"views/translate/translate_icon_view.cc",
"views/translate/translate_icon_view.h",
"views/update_recommended_message_box.cc",
"views/update_recommended_message_box.h",
"views/webauthn/authenticator_request_dialog_view.cc",
......@@ -2983,6 +3245,10 @@ jumbo_split_static_library("ui") {
"views/webauthn/sheet_view_factory.h",
"views/webauthn/transport_list_view.cc",
"views/webauthn/transport_list_view.h",
"views/webshare/webshare_target_picker_view.cc",
"views/webshare/webshare_target_picker_view.h",
"views_mode_controller.cc",
"views_mode_controller.h",
"webauthn/authenticator_request_sheet_model.h",
"webauthn/other_transports_menu_model.cc",
"webauthn/other_transports_menu_model.h",
......@@ -2997,40 +3263,11 @@ jumbo_split_static_library("ui") {
"//components/payments/content",
"//components/payments/core",
"//services/ws/public/cpp/input_devices",
"//ui/views:features",
]
allow_circular_includes_from += [ "//chrome/browser/ui/views" ]
if (is_mac) {
sources += [
"views/apps/app_window_native_widget_mac.h",
"views/apps/app_window_native_widget_mac.mm",
"views/apps/chrome_native_app_window_views_mac.h",
"views/apps/chrome_native_app_window_views_mac.mm",
"views/apps/native_app_window_frame_view_mac.h",
"views/apps/native_app_window_frame_view_mac.mm",
"views/chrome_views_delegate_mac.cc",
"views/frame/native_widget_mac_frameless_nswindow.h",
"views/frame/native_widget_mac_frameless_nswindow.mm",
]
} else {
sources += [
"views/create_application_shortcut_view.cc",
"views/create_application_shortcut_view.h",
# TODO(ellyjones): Mus is not supported on Mac (there is no ui::Window
# apart from aura::Window, which is also not supported).
"views/ime_driver/ime_driver_mus.cc",
"views/ime_driver/ime_driver_mus.h",
"views/ime_driver/remote_text_input_client.cc",
"views/ime_driver/remote_text_input_client.h",
"views/ime_driver/simple_input_method.cc",
"views/ime_driver/simple_input_method.h",
]
deps += [ "//ui/views/mus" ]
}
if (enable_dice_support) {
sources += [
"views/sync/dice_bubble_sync_promo_view.cc",
......@@ -3040,315 +3277,6 @@ jumbo_split_static_library("ui") {
]
}
if (!is_mac || mac_views_browser) {
sources += [
"views/accessibility/invert_bubble_view.cc",
"views/accessibility/invert_bubble_view.h",
"views/autofill/local_card_migration_icon_view.cc",
"views/autofill/local_card_migration_icon_view.h",
"views/autofill/save_card_icon_view.cc",
"views/autofill/save_card_icon_view.h",
"views/bookmarks/bookmark_bar_instructions_view.cc",
"views/bookmarks/bookmark_bar_instructions_view.h",
"views/bookmarks/bookmark_bar_view.cc",
"views/bookmarks/bookmark_bar_view.h",
"views/bookmarks/bookmark_bar_view_observer.h",
"views/bookmarks/bookmark_context_menu.cc",
"views/bookmarks/bookmark_context_menu.h",
"views/bookmarks/bookmark_drag_drop_views.cc",
"views/bookmarks/bookmark_menu_controller_observer.h",
"views/bookmarks/bookmark_menu_controller_views.cc",
"views/bookmarks/bookmark_menu_controller_views.h",
"views/bookmarks/bookmark_menu_delegate.cc",
"views/bookmarks/bookmark_menu_delegate.h",
"views/browser_dialogs_views.cc",
"views/bubble_anchor_util_views.cc",
"views/certificate_selector.cc",
"views/certificate_selector.h",
"views/chrome_web_dialog_view.cc",
"views/constrained_web_dialog_delegate_views.cc",
"views/download/download_feedback_dialog_view.cc",
"views/download/download_feedback_dialog_view.h",
"views/download/download_in_progress_dialog_view.cc",
"views/download/download_in_progress_dialog_view.h",
"views/download/download_item_view.cc",
"views/download/download_item_view.h",
"views/download/download_shelf_context_menu_view.cc",
"views/download/download_shelf_context_menu_view.h",
"views/download/download_shelf_view.cc",
"views/download/download_shelf_view.h",
"views/download/download_started_animation_views.cc",
"views/dropdown_bar_host.cc",
"views/dropdown_bar_host.h",
"views/dropdown_bar_host_delegate.h",
"views/feature_promos/bookmark_promo_bubble_view.cc",
"views/feature_promos/bookmark_promo_bubble_view.h",
"views/feature_promos/feature_promo_bubble_view.cc",
"views/feature_promos/feature_promo_bubble_view.h",
"views/feature_promos/incognito_window_promo_bubble_view.cc",
"views/feature_promos/incognito_window_promo_bubble_view.h",
"views/feature_promos/new_tab_promo_bubble_view.cc",
"views/feature_promos/new_tab_promo_bubble_view.h",
"views/find_bar_host.cc",
"views/find_bar_host.h",
"views/find_bar_view.cc",
"views/find_bar_view.h",
"views/frame/app_menu_button.cc",
"views/frame/app_menu_button.h",
"views/frame/avatar_button_manager.cc",
"views/frame/avatar_button_manager.h",
"views/frame/browser_frame.cc",
"views/frame/browser_frame.h",
"views/frame/browser_non_client_frame_view.cc",
"views/frame/browser_non_client_frame_view.h",
"views/frame/browser_root_view.cc",
"views/frame/browser_root_view.h",
"views/frame/browser_view.cc",
"views/frame/browser_view.h",
"views/frame/browser_view_commands_mac.h",
"views/frame/browser_view_commands_mac.mm",
"views/frame/browser_view_layout.cc",
"views/frame/browser_view_layout.h",
"views/frame/browser_view_layout_delegate.h",
"views/frame/browser_window_factory.cc",
"views/frame/contents_layout_manager.cc",
"views/frame/contents_layout_manager.h",
"views/frame/contents_web_view.cc",
"views/frame/contents_web_view.h",
"views/frame/hosted_app_button_container.cc",
"views/frame/hosted_app_button_container.h",
"views/frame/hosted_app_menu_button.cc",
"views/frame/hosted_app_menu_button.h",
"views/frame/hosted_app_origin_text.cc",
"views/frame/hosted_app_origin_text.h",
"views/frame/immersive_mode_controller.cc",
"views/frame/immersive_mode_controller.h",
"views/frame/immersive_mode_controller_factory_views.cc",
"views/frame/immersive_mode_controller_stub.cc",
"views/frame/immersive_mode_controller_stub.h",
"views/frame/native_browser_frame.h",
"views/frame/native_browser_frame_factory.cc",
"views/frame/native_browser_frame_factory.h",
"views/frame/system_menu_model_builder.cc",
"views/frame/system_menu_model_builder.h",
"views/frame/system_menu_model_delegate.cc",
"views/frame/system_menu_model_delegate.h",
"views/frame/toolbar_button_provider.h",
"views/frame/top_container_view.cc",
"views/frame/top_container_view.h",
"views/frame/top_controls_slide_controller.cc",
"views/frame/top_controls_slide_controller.h",
"views/frame/web_contents_close_handler.cc",
"views/frame/web_contents_close_handler.h",
"views/frame/web_contents_close_handler_delegate.h",
"views/hung_renderer_view.cc",
"views/hung_renderer_view.h",
"views/ime/ime_warning_bubble_view.cc",
"views/ime/ime_warning_bubble_view.h",
"views/infobars/alternate_nav_infobar_view.cc",
"views/infobars/alternate_nav_infobar_view.h",
"views/infobars/confirm_infobar.cc",
"views/infobars/confirm_infobar.h",
"views/infobars/infobar_container_view.cc",
"views/infobars/infobar_container_view.h",
"views/infobars/infobar_view.cc",
"views/infobars/infobar_view.h",
"views/load_complete_listener.cc",
"views/load_complete_listener.h",
"views/location_bar/background_with_1_px_border.cc",
"views/location_bar/background_with_1_px_border.h",
"views/location_bar/content_setting_image_view.cc",
"views/location_bar/content_setting_image_view.h",
"views/location_bar/find_bar_icon.cc",
"views/location_bar/find_bar_icon.h",
"views/location_bar/icon_label_bubble_view.cc",
"views/location_bar/icon_label_bubble_view.h",
"views/location_bar/keyword_hint_view.cc",
"views/location_bar/keyword_hint_view.h",
"views/location_bar/location_bar_layout.cc",
"views/location_bar/location_bar_layout.h",
"views/location_bar/location_bar_view.cc",
"views/location_bar/location_bar_view.h",
"views/location_bar/location_icon_view.cc",
"views/location_bar/location_icon_view.h",
"views/location_bar/selected_keyword_view.cc",
"views/location_bar/selected_keyword_view.h",
"views/location_bar/star_view.cc",
"views/location_bar/star_view.h",
"views/media_router/cast_dialog_helper.cc",
"views/media_router/cast_dialog_helper.h",
"views/media_router/cast_dialog_metrics.cc",
"views/media_router/cast_dialog_metrics.h",
"views/media_router/cast_dialog_no_sinks_view.cc",
"views/media_router/cast_dialog_no_sinks_view.h",
"views/media_router/cast_dialog_sink_button.cc",
"views/media_router/cast_dialog_sink_button.h",
"views/media_router/cast_dialog_view.cc",
"views/media_router/cast_dialog_view.h",
"views/media_router/cast_toolbar_button.cc",
"views/media_router/cast_toolbar_button.h",
"views/media_router/cloud_services_dialog_view.cc",
"views/media_router/cloud_services_dialog_view.h",
"views/media_router/media_remoting_dialog_view.cc",
"views/media_router/media_remoting_dialog_view.h",
"views/media_router/media_router_dialog_controller_views.cc",
"views/media_router/media_router_dialog_controller_views.h",
"views/media_router/media_router_views_ui.cc",
"views/media_router/media_router_views_ui.h",
"views/media_router/presentation_receiver_window_factory.cc",
"views/media_router/presentation_receiver_window_frame.cc",
"views/media_router/presentation_receiver_window_frame.h",
"views/media_router/presentation_receiver_window_view.cc",
"views/media_router/presentation_receiver_window_view.h",
"views/media_router/web_contents_display_observer_view.cc",
"views/media_router/web_contents_display_observer_view.h",
"views/omnibox/omnibox_match_cell_view.cc",
"views/omnibox/omnibox_match_cell_view.h",
"views/omnibox/omnibox_popup_contents_view.cc",
"views/omnibox/omnibox_popup_contents_view.h",
"views/omnibox/omnibox_result_view.cc",
"views/omnibox/omnibox_result_view.h",
"views/omnibox/omnibox_tab_switch_button.cc",
"views/omnibox/omnibox_tab_switch_button.h",
"views/omnibox/omnibox_text_view.cc",
"views/omnibox/omnibox_text_view.h",
"views/omnibox/omnibox_view_views.cc",
"views/omnibox/omnibox_view_views.h",
"views/omnibox/rounded_omnibox_results_frame.cc",
"views/omnibox/rounded_omnibox_results_frame.h",
"views/page_action/page_action_icon_container_view.cc",
"views/page_action/page_action_icon_container_view.h",
"views/page_action/page_action_icon_view.cc",
"views/page_action/page_action_icon_view.h",
"views/page_action/zoom_view.cc",
"views/page_action/zoom_view.h",
"views/passwords/manage_passwords_icon_views.cc",
"views/passwords/manage_passwords_icon_views.h",
"views/passwords/password_generation_popup_view_views.cc",
"views/passwords/password_generation_popup_view_views.h",
"views/permission_bubble/chooser_bubble_ui_views.cc",
"views/permission_bubble/permission_prompt_impl_views.cc",
"views/profiles/avatar_button_style.h",
"views/profiles/avatar_toolbar_button.cc",
"views/profiles/avatar_toolbar_button.h",
"views/profiles/profile_indicator_icon.cc",
"views/profiles/profile_indicator_icon.h",
"views/profiles/signin_view_controller_delegate_views.cc",
"views/profiles/signin_view_controller_delegate_views.h",
"views/proximity_auth/proximity_auth_error_bubble_view.cc",
"views/proximity_auth/proximity_auth_error_bubble_view.h",
"views/sad_tab_view.cc",
"views/sad_tab_view.h",
"views/ssl_client_certificate_selector.cc",
"views/ssl_client_certificate_selector.h",
"views/status_bubble_views.cc",
"views/status_bubble_views.h",
"views/tab_contents/chrome_web_contents_view_focus_helper.cc",
"views/tab_contents/chrome_web_contents_view_focus_helper.h",
"views/tab_dialogs_views.cc",
"views/tab_dialogs_views.h",
"views/tab_icon_view.cc",
"views/tab_icon_view.h",
"views/tab_modal_confirm_dialog_views.cc",
"views/tab_modal_confirm_dialog_views.h",
"views/tabs/alert_indicator_button.cc",
"views/tabs/alert_indicator_button.h",
"views/tabs/browser_tab_strip_controller.cc",
"views/tabs/browser_tab_strip_controller.h",
"views/tabs/glow_hover_controller.cc",
"views/tabs/glow_hover_controller.h",
"views/tabs/new_tab_button.cc",
"views/tabs/new_tab_button.h",
"views/tabs/stacked_tab_strip_layout.cc",
"views/tabs/stacked_tab_strip_layout.h",
"views/tabs/tab.cc",
"views/tabs/tab.h",
"views/tabs/tab_close_button.cc",
"views/tabs/tab_close_button.h",
"views/tabs/tab_controller.h",
"views/tabs/tab_drag_controller.cc",
"views/tabs/tab_drag_controller.h",
"views/tabs/tab_icon.cc",
"views/tabs/tab_icon.h",
"views/tabs/tab_strip.cc",
"views/tabs/tab_strip.h",
"views/tabs/tab_strip_controller.h",
"views/tabs/tab_strip_layout.cc",
"views/tabs/tab_strip_layout.h",
"views/tabs/window_finder.h",
"views/theme_copying_widget.cc",
"views/theme_copying_widget.h",
"views/toolbar/app_menu.cc",
"views/toolbar/app_menu.h",
"views/toolbar/app_menu_observer.h",
"views/toolbar/browser_actions_container.cc",
"views/toolbar/browser_actions_container.h",
"views/toolbar/browser_app_menu_button.cc",
"views/toolbar/browser_app_menu_button.h",
"views/toolbar/extension_toolbar_menu_view.cc",
"views/toolbar/extension_toolbar_menu_view.h",
"views/toolbar/home_button.cc",
"views/toolbar/home_button.h",
"views/toolbar/media_router_action_platform_delegate_views.cc",
"views/toolbar/media_router_action_platform_delegate_views.h",
"views/toolbar/reload_button.cc",
"views/toolbar/reload_button.h",
"views/toolbar/toolbar_action_view.cc",
"views/toolbar/toolbar_action_view.h",
"views/toolbar/toolbar_action_view_delegate_views.h",
"views/toolbar/toolbar_button.cc",
"views/toolbar/toolbar_button.h",
"views/toolbar/toolbar_ink_drop_util.cc",
"views/toolbar/toolbar_ink_drop_util.h",
"views/toolbar/toolbar_view.cc",
"views/toolbar/toolbar_view.h",
"views/translate/translate_icon_view.cc",
"views/translate/translate_icon_view.h",
"views/webshare/webshare_target_picker_view.cc",
"views/webshare/webshare_target_picker_view.h",
"views_mode_controller.cc",
"views_mode_controller.h",
]
deps += [ "//ui/views:features" ]
if (is_mac) {
# This source file is compiled out on Mac because there is a
# Mac-specific implementation of it.
sources -= [ "views/permission_bubble/permission_prompt_impl_views.cc" ]
}
if (!is_chromeos) {
sources += [
"views/frame/opaque_browser_frame_view.cc",
"views/frame/opaque_browser_frame_view.h",
"views/frame/opaque_browser_frame_view_layout.cc",
"views/frame/opaque_browser_frame_view_layout.h",
"views/frame/opaque_browser_frame_view_layout_delegate.h",
"views/frame/opaque_browser_frame_view_linux.cc",
"views/frame/opaque_browser_frame_view_linux.h",
"views/frame/opaque_browser_frame_view_platform_specific.cc",
"views/frame/opaque_browser_frame_view_platform_specific.h",
"views/outdated_upgrade_bubble_view.cc",
"views/outdated_upgrade_bubble_view.h",
"views/policy/enterprise_startup_dialog_view.cc",
"views/policy/enterprise_startup_dialog_view.h",
"views/profiles/forced_reauthentication_dialog_view.cc",
"views/profiles/forced_reauthentication_dialog_view.h",
"views/sync/one_click_signin_dialog_view.cc",
"views/sync/one_click_signin_dialog_view.h",
"views/tabs/window_finder.cc",
]
}
if (use_aura) {
deps += [
"//services/ws/public/cpp",
"//services/ws/public/mojom",
]
}
}
if (enable_native_window_nav_buttons) {
sources += [
"views/frame/desktop_linux_browser_frame_view.cc",
......@@ -3373,11 +3301,50 @@ jumbo_split_static_library("ui") {
}
if (is_mac) {
sources += [ "views/chrome_platform_style_mac.mm" ]
sources += [
"views/apps/app_window_native_widget_mac.h",
"views/apps/app_window_native_widget_mac.mm",
"views/apps/chrome_native_app_window_views_mac.h",
"views/apps/chrome_native_app_window_views_mac.mm",
"views/apps/native_app_window_frame_view_mac.h",
"views/apps/native_app_window_frame_view_mac.mm",
"views/chrome_platform_style_mac.mm",
"views/chrome_views_delegate_mac.cc",
"views/frame/native_widget_mac_frameless_nswindow.h",
"views/frame/native_widget_mac_frameless_nswindow.mm",
"views/policy/enterprise_startup_dialog_mac_util.h",
"views/policy/enterprise_startup_dialog_mac_util.mm",
"views/relaunch_notification/get_app_menu_anchor_point.h",
"views/relaunch_notification/get_app_menu_anchor_point.mm",
]
# This source file is compiled out on Mac because there is a
# Mac-specific implementation of it.
sources -= [ "views/permission_bubble/permission_prompt_impl_views.cc" ]
} else {
sources += [
"views/create_application_shortcut_view.cc",
"views/create_application_shortcut_view.h",
# TODO(ellyjones): Mus is not supported on Mac (there is no ui::Window
# apart from aura::Window, which is also not supported).
"views/ime_driver/ime_driver_mus.cc",
"views/ime_driver/ime_driver_mus.h",
"views/ime_driver/remote_text_input_client.cc",
"views/ime_driver/remote_text_input_client.h",
"views/ime_driver/simple_input_method.cc",
"views/ime_driver/simple_input_method.h",
]
deps += [ "//ui/views/mus" ]
}
if (is_win) {
sources += [ "views/chrome_views_delegate_win.cc" ]
sources += [
"views/chrome_views_delegate_win.cc",
"views/feature_promos/bookmark_bar_promo_bubble_view.cc",
"views/feature_promos/bookmark_bar_promo_bubble_view.h",
]
}
if (is_win || is_desktop_linux) {
......@@ -3388,7 +3355,11 @@ jumbo_split_static_library("ui") {
}
if (use_aura) {
deps += [ "//components/ui_devtools/views" ]
deps += [
"//components/ui_devtools/views",
"//services/ws/public/cpp",
"//services/ws/public/mojom",
]
# These files do Gtk+-based theming, but Gtk+ is not available on
# Ozone builds, or on common environments where Ozone will be used.
......@@ -3410,6 +3381,21 @@ jumbo_split_static_library("ui") {
]
} else {
sources += [
"views/frame/opaque_browser_frame_view.cc",
"views/frame/opaque_browser_frame_view.h",
"views/frame/opaque_browser_frame_view_layout.cc",
"views/frame/opaque_browser_frame_view_layout.h",
"views/frame/opaque_browser_frame_view_layout_delegate.h",
"views/frame/opaque_browser_frame_view_linux.cc",
"views/frame/opaque_browser_frame_view_linux.h",
"views/frame/opaque_browser_frame_view_platform_specific.cc",
"views/frame/opaque_browser_frame_view_platform_specific.h",
"views/outdated_upgrade_bubble_view.cc",
"views/outdated_upgrade_bubble_view.h",
"views/policy/enterprise_startup_dialog_view.cc",
"views/policy/enterprise_startup_dialog_view.h",
"views/profiles/forced_reauthentication_dialog_view.cc",
"views/profiles/forced_reauthentication_dialog_view.h",
"views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.cc",
"views/relaunch_notification/relaunch_notification_controller_platform_impl_desktop.h",
"views/relaunch_notification/relaunch_recommended_bubble_view.cc",
......@@ -3417,28 +3403,15 @@ jumbo_split_static_library("ui") {
"views/relaunch_notification/relaunch_required_dialog_view.cc",
"views/relaunch_notification/relaunch_required_dialog_view.h",
"views/screen_capture_notification_ui_views.cc",
]
}
if (is_mac) {
sources += [
"views/policy/enterprise_startup_dialog_mac_util.h",
"views/policy/enterprise_startup_dialog_mac_util.mm",
"views/relaunch_notification/get_app_menu_anchor_point.h",
"views/relaunch_notification/get_app_menu_anchor_point.mm",
"views/sync/one_click_signin_dialog_view.cc",
"views/sync/one_click_signin_dialog_view.h",
"views/tabs/window_finder.cc",
]
}
if (is_chrome_branded) {
deps += [ "//chrome/browser/ui/media_router/internal/vector_icons" ]
}
if (is_win) {
sources += [
"views/feature_promos/bookmark_bar_promo_bubble_view.cc",
"views/feature_promos/bookmark_bar_promo_bubble_view.h",
]
}
}
if (use_aura) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment