Chromium Code Reviews| Index: chrome/browser/ui/BUILD.gn |
| diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn |
| index 87033cea93abb456b86c4e128145bdbc62d327d3..579e7b43336ebe5dd24741a8fa18833488157bf9 100644 |
| --- a/chrome/browser/ui/BUILD.gn |
| +++ b/chrome/browser/ui/BUILD.gn |
| @@ -213,10 +213,8 @@ split_static_library("ui") { |
| "webui/browsing_history_handler.h", |
| "webui/chrome_web_ui_controller_factory.cc", |
| "webui/chrome_web_ui_controller_factory.h", |
| - "webui/chromeos/bluetooth_pairing_ui.cc", |
| - "webui/chromeos/bluetooth_pairing_ui.h", |
| - "webui/chromeos/certificate_manager_dialog_ui.cc", |
| - "webui/chromeos/certificate_manager_dialog_ui.h", |
| + |
| + # TODO(dbeam): why are all these /chromeos/ files on all platforms? |
|
wychen
2017/06/09 23:07:55
GN magically filter files based on their names, so
Dan Beam
2017/06/09 23:45:22
if that's the case, why did I have to move all the
|
| "webui/chromeos/choose_mobile_network_ui.cc", |
| "webui/chromeos/choose_mobile_network_ui.h", |
| "webui/chromeos/cryptohome_ui.cc", |
| @@ -322,8 +320,6 @@ split_static_library("ui") { |
| "webui/chromeos/network_ui.h", |
| "webui/chromeos/power_ui.cc", |
| "webui/chromeos/power_ui.h", |
| - "webui/chromeos/proxy_settings_ui.cc", |
| - "webui/chromeos/proxy_settings_ui.h", |
| "webui/chromeos/set_time_ui.cc", |
| "webui/chromeos/set_time_ui.h", |
| "webui/chromeos/sim_unlock_ui.cc", |
| @@ -976,103 +972,6 @@ split_static_library("ui") { |
| "webui/ntp/ntp_resource_cache.h", |
| "webui/ntp/ntp_resource_cache_factory.cc", |
| "webui/ntp/ntp_resource_cache_factory.h", |
| - "webui/options/autofill_options_handler.cc", |
| - "webui/options/autofill_options_handler.h", |
| - "webui/options/automatic_settings_reset_handler.cc", |
| - "webui/options/automatic_settings_reset_handler.h", |
| - "webui/options/browser_options_handler.cc", |
| - "webui/options/browser_options_handler.h", |
| - "webui/options/chromeos/accounts_options_handler.cc", |
| - "webui/options/chromeos/accounts_options_handler.h", |
| - "webui/options/chromeos/bluetooth_options_handler.cc", |
| - "webui/options/chromeos/bluetooth_options_handler.h", |
| - "webui/options/chromeos/change_picture_options_handler.cc", |
| - "webui/options/chromeos/change_picture_options_handler.h", |
| - "webui/options/chromeos/core_chromeos_options_handler.cc", |
| - "webui/options/chromeos/core_chromeos_options_handler.h", |
| - "webui/options/chromeos/cros_language_options_handler.cc", |
| - "webui/options/chromeos/cros_language_options_handler.h", |
| - "webui/options/chromeos/date_time_options_handler.cc", |
| - "webui/options/chromeos/date_time_options_handler.h", |
| - "webui/options/chromeos/display_options_handler.cc", |
| - "webui/options/chromeos/display_options_handler.h", |
| - "webui/options/chromeos/display_overscan_handler.cc", |
| - "webui/options/chromeos/display_overscan_handler.h", |
| - "webui/options/chromeos/internet_options_handler.cc", |
| - "webui/options/chromeos/internet_options_handler.h", |
| - "webui/options/chromeos/internet_options_handler_strings.cc", |
| - "webui/options/chromeos/internet_options_handler_strings.h", |
| - "webui/options/chromeos/keyboard_handler.cc", |
| - "webui/options/chromeos/keyboard_handler.h", |
| - "webui/options/chromeos/options_stylus_handler.cc", |
| - "webui/options/chromeos/options_stylus_handler.h", |
| - "webui/options/chromeos/pointer_handler.cc", |
| - "webui/options/chromeos/pointer_handler.h", |
| - "webui/options/chromeos/power_handler.cc", |
| - "webui/options/chromeos/power_handler.h", |
| - "webui/options/chromeos/proxy_handler.cc", |
| - "webui/options/chromeos/proxy_handler.h", |
| - "webui/options/chromeos/stats_options_handler.cc", |
| - "webui/options/chromeos/stats_options_handler.h", |
| - "webui/options/chromeos/storage_manager_handler.cc", |
| - "webui/options/chromeos/storage_manager_handler.h", |
| - "webui/options/chromeos/user_image_source.cc", |
| - "webui/options/chromeos/user_image_source.h", |
| - "webui/options/clear_browser_data_handler.cc", |
| - "webui/options/clear_browser_data_handler.h", |
| - "webui/options/content_settings_handler.cc", |
| - "webui/options/content_settings_handler.h", |
| - "webui/options/cookies_view_handler.cc", |
| - "webui/options/cookies_view_handler.h", |
| - "webui/options/core_options_handler.cc", |
| - "webui/options/core_options_handler.h", |
| - "webui/options/create_profile_handler.cc", |
| - "webui/options/create_profile_handler.h", |
| - "webui/options/easy_unlock_handler.cc", |
| - "webui/options/easy_unlock_handler.h", |
| - "webui/options/font_settings_handler.cc", |
| - "webui/options/font_settings_handler.h", |
| - "webui/options/font_settings_utils.cc", |
| - "webui/options/font_settings_utils.h", |
| - "webui/options/font_settings_utils_linux.cc", |
| - "webui/options/font_settings_utils_mac.mm", |
| - "webui/options/font_settings_utils_win.cc", |
| - "webui/options/handler_options_handler.cc", |
| - "webui/options/handler_options_handler.h", |
| - "webui/options/help_overlay_handler.cc", |
| - "webui/options/help_overlay_handler.h", |
| - "webui/options/home_page_overlay_handler.cc", |
| - "webui/options/home_page_overlay_handler.h", |
| - "webui/options/import_data_handler.cc", |
| - "webui/options/import_data_handler.h", |
| - "webui/options/language_dictionary_overlay_handler.cc", |
| - "webui/options/language_dictionary_overlay_handler.h", |
| - "webui/options/language_options_handler.cc", |
| - "webui/options/language_options_handler.h", |
| - "webui/options/language_options_handler_common.cc", |
| - "webui/options/language_options_handler_common.h", |
| - "webui/options/manage_profile_handler.cc", |
| - "webui/options/manage_profile_handler.h", |
| - "webui/options/media_devices_selection_handler.cc", |
| - "webui/options/media_devices_selection_handler.h", |
| - "webui/options/options_ui.cc", |
| - "webui/options/options_ui.h", |
| - "webui/options/password_manager_handler.cc", |
| - "webui/options/password_manager_handler.h", |
| - "webui/options/reset_profile_settings_handler.cc", |
| - "webui/options/reset_profile_settings_handler.h", |
| - "webui/options/search_engine_manager_handler.cc", |
| - "webui/options/search_engine_manager_handler.h", |
| - "webui/options/startup_pages_handler.cc", |
| - "webui/options/startup_pages_handler.h", |
| - "webui/options/supervised_user_create_confirm_handler.cc", |
| - "webui/options/supervised_user_create_confirm_handler.h", |
| - "webui/options/supervised_user_import_handler.cc", |
| - "webui/options/supervised_user_import_handler.h", |
| - "webui/options/supervised_user_learn_more_handler.cc", |
| - "webui/options/supervised_user_learn_more_handler.h", |
| - "webui/options/sync_setup_handler.cc", |
| - "webui/options/sync_setup_handler.h", |
| "webui/plural_string_handler.cc", |
| "webui/plural_string_handler.h", |
| "webui/policy_indicator_localized_strings_provider.cc", |
| @@ -1279,6 +1178,104 @@ split_static_library("ui") { |
| "views/select_file_dialog_extension.h", |
| "views/select_file_dialog_extension_factory.cc", |
| "views/select_file_dialog_extension_factory.h", |
| + "webui/chromeos/bluetooth_pairing_ui.cc", |
| + "webui/chromeos/bluetooth_pairing_ui.h", |
| + "webui/chromeos/certificate_manager_dialog_ui.cc", |
| + "webui/chromeos/certificate_manager_dialog_ui.h", |
| + "webui/chromeos/proxy_settings_ui.cc", |
| + "webui/chromeos/proxy_settings_ui.h", |
| + "webui/options/autofill_options_handler.cc", |
| + "webui/options/autofill_options_handler.h", |
| + "webui/options/automatic_settings_reset_handler.cc", |
| + "webui/options/automatic_settings_reset_handler.h", |
| + "webui/options/browser_options_handler.cc", |
| + "webui/options/browser_options_handler.h", |
| + "webui/options/chromeos/accounts_options_handler.cc", |
| + "webui/options/chromeos/accounts_options_handler.h", |
| + "webui/options/chromeos/bluetooth_options_handler.cc", |
| + "webui/options/chromeos/bluetooth_options_handler.h", |
| + "webui/options/chromeos/change_picture_options_handler.cc", |
| + "webui/options/chromeos/change_picture_options_handler.h", |
| + "webui/options/chromeos/core_chromeos_options_handler.cc", |
| + "webui/options/chromeos/core_chromeos_options_handler.h", |
| + "webui/options/chromeos/cros_language_options_handler.cc", |
| + "webui/options/chromeos/cros_language_options_handler.h", |
| + "webui/options/chromeos/date_time_options_handler.cc", |
| + "webui/options/chromeos/date_time_options_handler.h", |
| + "webui/options/chromeos/display_options_handler.cc", |
| + "webui/options/chromeos/display_options_handler.h", |
| + "webui/options/chromeos/display_overscan_handler.cc", |
| + "webui/options/chromeos/display_overscan_handler.h", |
| + "webui/options/chromeos/internet_options_handler.cc", |
| + "webui/options/chromeos/internet_options_handler.h", |
| + "webui/options/chromeos/internet_options_handler_strings.cc", |
| + "webui/options/chromeos/internet_options_handler_strings.h", |
| + "webui/options/chromeos/keyboard_handler.cc", |
| + "webui/options/chromeos/keyboard_handler.h", |
| + "webui/options/chromeos/options_stylus_handler.cc", |
| + "webui/options/chromeos/options_stylus_handler.h", |
| + "webui/options/chromeos/pointer_handler.cc", |
| + "webui/options/chromeos/pointer_handler.h", |
| + "webui/options/chromeos/power_handler.cc", |
| + "webui/options/chromeos/power_handler.h", |
| + "webui/options/chromeos/proxy_handler.cc", |
| + "webui/options/chromeos/proxy_handler.h", |
| + "webui/options/chromeos/stats_options_handler.cc", |
| + "webui/options/chromeos/stats_options_handler.h", |
| + "webui/options/chromeos/storage_manager_handler.cc", |
| + "webui/options/chromeos/storage_manager_handler.h", |
| + "webui/options/chromeos/user_image_source.cc", |
| + "webui/options/chromeos/user_image_source.h", |
| + "webui/options/clear_browser_data_handler.cc", |
| + "webui/options/clear_browser_data_handler.h", |
| + "webui/options/content_settings_handler.cc", |
| + "webui/options/content_settings_handler.h", |
| + "webui/options/cookies_view_handler.cc", |
| + "webui/options/cookies_view_handler.h", |
| + "webui/options/core_options_handler.cc", |
| + "webui/options/core_options_handler.h", |
| + "webui/options/create_profile_handler.cc", |
| + "webui/options/create_profile_handler.h", |
| + "webui/options/easy_unlock_handler.cc", |
| + "webui/options/easy_unlock_handler.h", |
| + "webui/options/font_settings_handler.cc", |
| + "webui/options/font_settings_handler.h", |
| + "webui/options/handler_options_handler.cc", |
| + "webui/options/handler_options_handler.h", |
| + "webui/options/help_overlay_handler.cc", |
| + "webui/options/help_overlay_handler.h", |
| + "webui/options/home_page_overlay_handler.cc", |
| + "webui/options/home_page_overlay_handler.h", |
| + "webui/options/import_data_handler.cc", |
| + "webui/options/import_data_handler.h", |
| + "webui/options/language_dictionary_overlay_handler.cc", |
| + "webui/options/language_dictionary_overlay_handler.h", |
| + "webui/options/language_options_handler.cc", |
| + "webui/options/language_options_handler.h", |
| + "webui/options/language_options_handler_common.cc", |
| + "webui/options/language_options_handler_common.h", |
| + "webui/options/manage_profile_handler.cc", |
| + "webui/options/manage_profile_handler.h", |
| + "webui/options/media_devices_selection_handler.cc", |
| + "webui/options/media_devices_selection_handler.h", |
| + "webui/options/options_ui.cc", |
| + "webui/options/options_ui.h", |
| + "webui/options/password_manager_handler.cc", |
| + "webui/options/password_manager_handler.h", |
| + "webui/options/reset_profile_settings_handler.cc", |
| + "webui/options/reset_profile_settings_handler.h", |
| + "webui/options/search_engine_manager_handler.cc", |
| + "webui/options/search_engine_manager_handler.h", |
| + "webui/options/startup_pages_handler.cc", |
| + "webui/options/startup_pages_handler.h", |
| + "webui/options/supervised_user_create_confirm_handler.cc", |
| + "webui/options/supervised_user_create_confirm_handler.h", |
| + "webui/options/supervised_user_import_handler.cc", |
| + "webui/options/supervised_user_import_handler.h", |
| + "webui/options/supervised_user_learn_more_handler.cc", |
| + "webui/options/supervised_user_learn_more_handler.h", |
| + "webui/options/sync_setup_handler.cc", |
| + "webui/options/sync_setup_handler.h", |
| ] |
| deps += [ |
| "//chrome/browser/chromeos", |
| @@ -2172,11 +2169,15 @@ split_static_library("ui") { |
| "crypto_module_delegate_nss.h", |
| "crypto_module_password_dialog_nss.cc", |
| "crypto_module_password_dialog_nss.h", |
| - "webui/options/certificate_manager_handler.cc", |
| - "webui/options/certificate_manager_handler.h", |
| "webui/settings/certificates_handler.cc", |
| "webui/settings/certificates_handler.h", |
| ] |
| + if (is_chromeos) { |
| + sources += [ |
| + "webui/options/certificate_manager_handler.cc", |
| + "webui/options/certificate_manager_handler.h", |
| + ] |
| + } |
| } |
| if (is_mac || is_win) { |
| sources += [ |