From aeddd327d27e99173c218bcef00422cd0d6cef30 Mon Sep 17 00:00:00 2001 From: thestig Date: Tue, 26 Aug 2014 23:58:39 -0700 Subject: [PATCH] Finish converting chrome_strings target to use qualified paths. BUG=401588 Review URL: https://codereview.chromium.org/507913002 Cr-Commit-Position: refs/heads/master@{#292111} --- chrome/app/BUILD.gn | 3 +++ chrome/app/resources/BUILD.gn | 1 + chrome/browser/android/browser_version.cc | 2 +- chrome/browser/chrome_quota_permission_context.cc | 2 +- chrome/browser/download/download_shelf.cc | 2 +- chrome/browser/first_run/first_run_internal_win.cc | 2 +- chrome/browser/geolocation/geolocation_infobar_delegate.cc | 2 +- chrome/browser/history/top_sites.cc | 2 +- chrome/browser/media/midi_permission_infobar_delegate.cc | 2 +- .../notifications/desktop_notification_infobar_delegate.cc | 2 +- chrome/browser/plugins/plugin_infobar_delegates.cc | 2 +- chrome/browser/prefs/prefs_syncable_service_unittest.cc | 2 +- chrome/browser/safe_browsing/safe_browsing_blocking_page.cc | 2 +- chrome/browser/spellchecker/spellcheck_factory.cc | 2 +- chrome/browser/sync/sync_ui_util.cc | 2 +- chrome/browser/ui/ash/system_tray_delegate_chromeos.cc | 2 +- chrome/browser/ui/ash/system_tray_delegate_linux.cc | 2 +- chrome/browser/ui/ash/system_tray_delegate_win.cc | 3 +-- chrome/browser/ui/browser.cc | 2 +- chrome/browser/ui/cocoa/browser_window_controller.mm | 2 +- chrome/browser/ui/hung_plugin_tab_helper.cc | 2 +- chrome/browser/ui/prefs/prefs_tab_helper.cc | 2 +- chrome/browser/ui/startup/startup_browser_creator_impl.cc | 2 +- chrome/browser/ui/views/collected_cookies_views.cc | 2 +- chrome/browser/ui/views/conflicting_module_view_win.cc | 2 +- chrome/browser/ui/views/create_application_shortcut_view.cc | 2 +- chrome/browser/ui/views/critical_notification_bubble_view.cc | 2 +- chrome/browser/ui/views/first_run_dialog.cc | 2 +- chrome/browser/ui/views/frame/browser_view.cc | 2 +- chrome/browser/ui/webui/about_ui.cc | 2 +- chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc | 2 +- chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc | 2 +- chrome/browser/ui/webui/favicon_source.cc | 2 +- chrome/browser/ui/webui/ntp/ntp_resource_cache.cc | 2 +- chrome/browser/ui/webui/options/browser_options_handler.cc | 2 +- chrome/browser/ui/webui/options/chromeos/proxy_handler.cc | 2 +- chrome/browser/ui/webui/options/clear_browser_data_handler.cc | 2 +- chrome/browser/ui/webui/options/content_settings_handler.cc | 2 +- chrome/browser/ui/webui/options/core_options_handler.cc | 2 +- chrome/browser/ui/webui/options/options_ui.cc | 2 +- .../browser/ui/webui/options/search_engine_manager_handler.cc | 2 +- chrome/browser/ui/webui/set_as_default_browser_ui.cc | 2 +- chrome/browser/ui/webui/sync_setup_handler.cc | 2 +- chrome/browser/ui/webui/system_info_ui.cc | 2 +- chrome/chrome_resources.gyp | 1 - 45 files changed, 46 insertions(+), 44 deletions(-) diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn index b226380bc08f69..3113d78bd02acb 100644 --- a/chrome/app/BUILD.gn +++ b/chrome/app/BUILD.gn @@ -9,6 +9,7 @@ import("//tools/grit/grit_rule.gni") grit("generated_resources") { source = "generated_resources.grd" output_dir = "$root_gen_dir/chrome" + use_qualified_include = true outputs = [ "grit/generated_resources.h", "generated_resources_am.pak", @@ -96,6 +97,7 @@ source_set("generated_resources_map") { grit("google_chrome_strings") { source = "google_chrome_strings.grd" output_dir = "$root_gen_dir/chrome" + use_qualified_include = true outputs = [ "grit/google_chrome_strings.h", "google_chrome_strings_am.pak", @@ -160,6 +162,7 @@ grit("google_chrome_strings") { grit("chromium_strings") { source = "chromium_strings.grd" output_dir = "$root_gen_dir/chrome" + use_qualified_include = true outputs = [ "grit/chromium_strings.h", "chromium_strings_am.pak", diff --git a/chrome/app/resources/BUILD.gn b/chrome/app/resources/BUILD.gn index 1eec16c6fc3d26..44e942c34a3d35 100644 --- a/chrome/app/resources/BUILD.gn +++ b/chrome/app/resources/BUILD.gn @@ -9,6 +9,7 @@ import("//tools/grit/grit_rule.gni") grit("locale_settings") { source = "locale_settings.grd" output_dir = "$root_gen_dir/chrome" + use_qualified_include = true outputs = [ "grit/locale_settings.h", "locale_settings_am.pak", diff --git a/chrome/browser/android/browser_version.cc b/chrome/browser/android/browser_version.cc index cdd1f32066bddb..030a21b2106c67 100644 --- a/chrome/browser/android/browser_version.cc +++ b/chrome/browser/android/browser_version.cc @@ -6,7 +6,7 @@ #include "base/android/jni_string.h" #include "chrome/common/chrome_version_info.h" -#include "grit/locale_settings.h" +#include "chrome/grit/locale_settings.h" #include "jni/BrowserVersion_jni.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chrome_quota_permission_context.cc b/chrome/browser/chrome_quota_permission_context.cc index 97620032e1b48f..25f5aded17b48a 100644 --- a/chrome/browser/chrome_quota_permission_context.cc +++ b/chrome/browser/chrome_quota_permission_context.cc @@ -16,12 +16,12 @@ #include "chrome/browser/ui/website_settings/permission_bubble_request.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/web_contents.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/download/download_shelf.cc b/chrome/browser/download/download_shelf.cc index 81d11b8366899f..c7337b959fb09f 100644 --- a/chrome/browser/download/download_shelf.cc +++ b/chrome/browser/download/download_shelf.cc @@ -20,11 +20,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "chrome/grit/locale_settings.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/web_contents.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/first_run/first_run_internal_win.cc b/chrome/browser/first_run/first_run_internal_win.cc index c383713abc0663..af317aa200d1f5 100644 --- a/chrome/browser/first_run/first_run_internal_win.cc +++ b/chrome/browser/first_run/first_run_internal_win.cc @@ -22,13 +22,13 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" +#include "chrome/grit/locale_settings.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/install_util.h" #include "chrome/installer/util/master_preferences.h" #include "chrome/installer/util/master_preferences_constants.h" #include "chrome/installer/util/util_constants.h" #include "content/public/browser/browser_thread.h" -#include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/win/shell.h" diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate.cc b/chrome/browser/geolocation/geolocation_infobar_delegate.cc index 1859d16ceecf63..5119178495394f 100644 --- a/chrome/browser/geolocation/geolocation_infobar_delegate.cc +++ b/chrome/browser/geolocation/geolocation_infobar_delegate.cc @@ -8,12 +8,12 @@ #include "chrome/browser/content_settings/permission_queue_controller.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/google/core/browser/google_util.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc index 8e180515ab3a32..b37271e75a6d5a 100644 --- a/chrome/browser/history/top_sites.cc +++ b/chrome/browser/history/top_sites.cc @@ -8,7 +8,7 @@ #include "chrome/browser/history/top_sites_impl.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" -#include "grit/locale_settings.h" +#include "chrome/grit/locale_settings.h" #include "grit/theme_resources.h" namespace history { diff --git a/chrome/browser/media/midi_permission_infobar_delegate.cc b/chrome/browser/media/midi_permission_infobar_delegate.cc index c8a0882048d13b..1bb05402325dbd 100644 --- a/chrome/browser/media/midi_permission_infobar_delegate.cc +++ b/chrome/browser/media/midi_permission_infobar_delegate.cc @@ -8,10 +8,10 @@ #include "chrome/browser/content_settings/permission_request_id.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/notifications/desktop_notification_infobar_delegate.cc b/chrome/browser/notifications/desktop_notification_infobar_delegate.cc index 036211ca2f5641..614f04c2442222 100644 --- a/chrome/browser/notifications/desktop_notification_infobar_delegate.cc +++ b/chrome/browser/notifications/desktop_notification_infobar_delegate.cc @@ -8,11 +8,11 @@ #include "chrome/browser/content_settings/permission_request_id.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/content_settings/core/common/content_settings_types.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/plugins/plugin_infobar_delegates.cc b/chrome/browser/plugins/plugin_infobar_delegates.cc index e1ef089f35596c..3bfd2c45361302 100644 --- a/chrome/browser/plugins/plugin_infobar_delegates.cc +++ b/chrome/browser/plugins/plugin_infobar_delegates.cc @@ -17,13 +17,13 @@ #include "chrome/browser/ui/browser_commands.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/google/core/browser/google_util.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/prefs/prefs_syncable_service_unittest.cc b/chrome/browser/prefs/prefs_syncable_service_unittest.cc index e5d06a7a15b670..0337853b4973ce 100644 --- a/chrome/browser/prefs/prefs_syncable_service_unittest.cc +++ b/chrome/browser/prefs/prefs_syncable_service_unittest.cc @@ -11,9 +11,9 @@ #include "chrome/browser/prefs/pref_model_associator.h" #include "chrome/browser/prefs/pref_service_syncable.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/locale_settings.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "components/pref_registry/pref_registry_syncable.h" -#include "grit/locale_settings.h" #include "sync/api/attachments/attachment_id.h" #include "sync/api/sync_change.h" #include "sync/api/sync_data.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index f1c4a72bcb5bfe..31e195d5c62b00 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -32,6 +32,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/google/core/browser/google_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/interstitial_page.h" @@ -39,7 +40,6 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "grit/browser_resources.h" -#include "grit/locale_settings.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/spellchecker/spellcheck_factory.cc b/chrome/browser/spellchecker/spellcheck_factory.cc index 0d1189f8154dbd..8df78f46373675 100644 --- a/chrome/browser/spellchecker/spellcheck_factory.cc +++ b/chrome/browser/spellchecker/spellcheck_factory.cc @@ -8,11 +8,11 @@ #include "chrome/browser/profiles/incognito_helpers.h" #include "chrome/browser/spellchecker/spellcheck_service.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/locale_settings.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/render_process_host.h" -#include "grit/locale_settings.h" // static SpellcheckService* SpellcheckServiceFactory::GetForContext( diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index e2202627653d53..d67b68dee44ebd 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -24,12 +24,12 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/core/browser/signin_manager_base.h" #include "google_apis/gaia/google_service_auth_error.h" #include "grit/browser_resources.h" -#include "grit/locale_settings.h" #include "sync/internal_api/public/base/model_type.h" #include "sync/internal_api/public/sessions/sync_session_snapshot.h" #include "sync/protocol/proto_enum_conversions.h" diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc index 18e10d406d1248..7051a1d74ff60a 100644 --- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc +++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.cc @@ -88,6 +88,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/session_manager_client.h" #include "chromeos/ime/extension_ime_util.h" @@ -108,7 +109,6 @@ #include "device/bluetooth/bluetooth_adapter_factory.h" #include "device/bluetooth/bluetooth_device.h" #include "grit/ash_strings.h" -#include "grit/locale_settings.h" #include "net/base/escape.h" #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/ash/system_tray_delegate_linux.cc b/chrome/browser/ui/ash/system_tray_delegate_linux.cc index 756cb3eed75b33..8cd59e4cfaf063 100644 --- a/chrome/browser/ui/ash/system_tray_delegate_linux.cc +++ b/chrome/browser/ui/ash/system_tray_delegate_linux.cc @@ -20,9 +20,9 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" #include "chrome/browser/upgrade_detector.h" +#include "chrome/grit/locale_settings.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_service.h" -#include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/ash/system_tray_delegate_win.cc b/chrome/browser/ui/ash/system_tray_delegate_win.cc index eef9cbe68e6107..b3337cef5f54cd 100644 --- a/chrome/browser/ui/ash/system_tray_delegate_win.cc +++ b/chrome/browser/ui/ash/system_tray_delegate_win.cc @@ -20,10 +20,9 @@ #include "chrome/browser/ui/chrome_pages.h" #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/upgrade_detector.h" +#include "chrome/grit/locale_settings.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_service.h" - -#include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index a92e32f8c2a2de..20d4bd1c59a4ab 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -151,6 +151,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/google/core/browser/google_url_tracker.h" @@ -183,7 +184,6 @@ #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/filename_util.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index cac872146ab6d4..53919d5018df51 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -81,6 +81,7 @@ #include "chrome/common/extensions/command.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/signin/core/common/profile_management_switches.h" #include "components/translate/core/browser/translate_manager.h" @@ -90,7 +91,6 @@ #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" -#include "grit/locale_settings.h" #import "ui/base/cocoa/cocoa_base_utils.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/hung_plugin_tab_helper.cc b/chrome/browser/ui/hung_plugin_tab_helper.cc index 76fddb207fae95..78f07595eedd07 100644 --- a/chrome/browser/ui/hung_plugin_tab_helper.cc +++ b/chrome/browser/ui/hung_plugin_tab_helper.cc @@ -14,6 +14,7 @@ #include "chrome/browser/infobars/infobar_service.h" #include "chrome/common/chrome_version_info.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/browser_child_process_host_iterator.h" @@ -25,7 +26,6 @@ #include "content/public/browser/render_process_host.h" #include "content/public/common/process_type.h" #include "content/public/common/result_codes.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.cc b/chrome/browser/ui/prefs/prefs_tab_helper.cc index d6406993c49e59..816e08b60f6009 100644 --- a/chrome/browser/ui/prefs/prefs_tab_helper.cc +++ b/chrome/browser/ui/prefs/prefs_tab_helper.cc @@ -18,13 +18,13 @@ #include "chrome/common/pref_font_webkit_names.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_names_util.h" +#include "chrome/grit/locale_settings.h" #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/web_preferences.h" -#include "grit/locale_settings.h" #include "grit/platform_locale_settings.h" #include "third_party/icu/source/common/unicode/uchar.h" #include "third_party/icu/source/common/unicode/uscript.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc index 3c6ae4937bfe2e..9b7a8dde856963 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -79,6 +79,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/locale_settings.h" #include "chrome/installer/util/browser_distribution.h" #include "components/google/core/browser/google_util.h" #include "content/public/browser/child_process_security_policy.h" @@ -92,7 +93,6 @@ #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" -#include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/ui/views/collected_cookies_views.cc b/chrome/browser/ui/views/collected_cookies_views.cc index d020e3c6969d72..4487710c489a48 100644 --- a/chrome/browser/ui/views/collected_cookies_views.cc +++ b/chrome/browser/ui/views/collected_cookies_views.cc @@ -24,10 +24,10 @@ #include "chrome/browser/ui/views/cookie_info_view.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/cookies/canonical_cookie.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/conflicting_module_view_win.cc b/chrome/browser/ui/views/conflicting_module_view_win.cc index 6e39295f603dad..690c4770e0ccf5 100644 --- a/chrome/browser/ui/views/conflicting_module_view_win.cc +++ b/chrome/browser/ui/views/conflicting_module_view_win.cc @@ -12,9 +12,9 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index c5276542888781..f6197c4fa64ea2 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -23,12 +23,12 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/favicon_base/select_favicon_frames.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/load_flags.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc index 3e8c59ac74439e..281a8c5b570540 100644 --- a/chrome/browser/ui/views/critical_notification_bubble_view.cc +++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc @@ -13,8 +13,8 @@ #include "chrome/common/pref_names.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "content/public/browser/user_metrics.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/accelerators/accelerator.h" diff --git a/chrome/browser/ui/views/first_run_dialog.cc b/chrome/browser/ui/views/first_run_dialog.cc index 47ce10d4fa9c6b..be41f7b27478cd 100644 --- a/chrome/browser/ui/views/first_run_dialog.cc +++ b/chrome/browser/ui/views/first_run_dialog.cc @@ -13,9 +13,9 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "chrome/installer/util/google_update_settings.h" #include "components/breakpad/app/breakpad_linux.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/aura/env.h" #include "ui/aura/window.h" diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index efd43e8b17c375..a0228561ef78cd 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -100,6 +100,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/password_manager/core/browser/password_manager.h" #include "components/signin/core/common/profile_management_switches.h" #include "components/translate/core/browser/language_state.h" @@ -112,7 +113,6 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/common/content_switches.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/aura/client/window_tree_client.h" diff --git a/chrome/browser/ui/webui/about_ui.cc b/chrome/browser/ui/webui/about_ui.cc index 3d51bb9f239ecc..8ad5412799455d 100644 --- a/chrome/browser/ui/webui/about_ui.cc +++ b/chrome/browser/ui/webui/about_ui.cc @@ -40,6 +40,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" @@ -49,7 +50,6 @@ #include "content/public/common/process_type.h" #include "google_apis/gaia/google_service_auth_error.h" #include "grit/browser_resources.h" -#include "grit/locale_settings.h" #include "net/base/escape.h" #include "net/base/filename_util.h" #include "net/base/load_flags.h" diff --git a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc index 49ea274b6661bb..85041cb95a0abc 100644 --- a/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/eula_screen_handler.cc @@ -17,9 +17,9 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "content/public/browser/web_contents.h" #include "grit/browser_resources.h" -#include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/widget/widget.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc index deb93de22d9ff7..4c1bd513bc6f60 100644 --- a/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc +++ b/chrome/browser/ui/webui/chromeos/mobile_setup_ui.cc @@ -27,6 +27,7 @@ #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "chromeos/network/device_state.h" #include "chromeos/network/network_configuration_handler.h" #include "chromeos/network/network_event_log.h" @@ -40,7 +41,6 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" -#include "grit/locale_settings.h" #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/favicon_source.cc b/chrome/browser/ui/webui/favicon_source.cc index faa6cdfa1fe9ff..281f8ca716961b 100644 --- a/chrome/browser/ui/webui/favicon_source.cc +++ b/chrome/browser/ui/webui/favicon_source.cc @@ -18,7 +18,7 @@ #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/common/favicon/favicon_url_parser.h" #include "chrome/common/url_constants.h" -#include "grit/locale_settings.h" +#include "chrome/grit/locale_settings.h" #include "net/url_request/url_request.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" diff --git a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc index 0abf4c204dd975..0206cd6006a817 100644 --- a/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +++ b/chrome/browser/ui/webui/ntp/ntp_resource_cache.cc @@ -39,13 +39,13 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/google/core/browser/google_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" #include "extensions/common/extension.h" #include "grit/browser_resources.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc index 50688889b19f9a..1d41103b095254 100644 --- a/chrome/browser/ui/webui/options/browser_options_handler.cc +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc @@ -68,6 +68,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "chromeos/chromeos_switches.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" @@ -88,7 +89,6 @@ #include "extensions/browser/extension_registry.h" #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/google_service_auth_error.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc index f5aecbfdb352f2..feb3fdf1d6fe80 100644 --- a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc @@ -13,9 +13,9 @@ #include "chrome/browser/chromeos/system/input_device_settings.h" #include "chrome/common/chrome_constants.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "chromeos/chromeos_constants.h" #include "content/public/browser/web_ui.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc index 280f506c025599..fe7d925bba2786 100644 --- a/chrome/browser/ui/webui/options/clear_browser_data_handler.cc +++ b/chrome/browser/ui/webui/options/clear_browser_data_handler.cc @@ -16,10 +16,10 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/google/core/browser/google_util.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/web_ui.h" -#include "grit/locale_settings.h" #include "ui/base/accelerators/accelerator.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/options/content_settings_handler.cc b/chrome/browser/ui/webui/options/content_settings_handler.cc index 308b1664175652..18dc71b61bad67 100644 --- a/chrome/browser/ui/webui/options/content_settings_handler.cc +++ b/chrome/browser/ui/webui/options/content_settings_handler.cc @@ -34,6 +34,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/google/core/browser/google_util.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/notification_service.h" @@ -48,7 +49,6 @@ #include "extensions/common/extension_set.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/webui/options/core_options_handler.cc b/chrome/browser/ui/webui/options/core_options_handler.cc index ef6a958d734626..a556d0b1e7c711 100644 --- a/chrome/browser/ui/webui/options/core_options_handler.cc +++ b/chrome/browser/ui/webui/options/core_options_handler.cc @@ -22,6 +22,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/url_fixer/url_fixer.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_types.h" @@ -32,7 +33,6 @@ #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" -#include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/webui/options/options_ui.cc b/chrome/browser/ui/webui/options/options_ui.cc index 509c251010243d..7fadd95ef07159 100644 --- a/chrome/browser/ui/webui/options/options_ui.cc +++ b/chrome/browser/ui/webui/options/options_ui.cc @@ -51,6 +51,7 @@ #include "chrome/browser/ui/webui/theme_source.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/omnibox/autocomplete_match.h" #include "components/omnibox/autocomplete_result.h" #include "content/public/browser/notification_types.h" @@ -59,7 +60,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_ui.h" -#include "grit/locale_settings.h" #include "grit/options_resources.h" #include "grit/theme_resources.h" #include "net/base/escape.h" diff --git a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc index 66711091565909..3ac89ac88791b6 100644 --- a/chrome/browser/ui/webui/options/search_engine_manager_handler.cc +++ b/chrome/browser/ui/webui/options/search_engine_manager_handler.cc @@ -15,13 +15,13 @@ #include "chrome/browser/ui/search_engines/template_url_table_model.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" -#include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/webui/set_as_default_browser_ui.cc b/chrome/browser/ui/webui/set_as_default_browser_ui.cc index 7df93a1cb29fff..eb37c082dab552 100644 --- a/chrome/browser/ui/webui/set_as_default_browser_ui.cc +++ b/chrome/browser/ui/webui/set_as_default_browser_ui.cc @@ -25,6 +25,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "chrome/installer/util/install_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" @@ -33,7 +34,6 @@ #include "content/public/browser/web_ui_data_source.h" #include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" -#include "grit/locale_settings.h" #include "ui/base/l10n/l10n_font_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/font.h" diff --git a/chrome/browser/ui/webui/sync_setup_handler.cc b/chrome/browser/ui/webui/sync_setup_handler.cc index 2090f4756eb771..c588e4172c8ffe 100644 --- a/chrome/browser/ui/webui/sync_setup_handler.cc +++ b/chrome/browser/ui/webui/sync_setup_handler.cc @@ -42,6 +42,7 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "components/google/core/browser/google_util.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_error_controller.h" @@ -53,7 +54,6 @@ #include "content/public/browser/web_contents_delegate.h" #include "google_apis/gaia/gaia_auth_util.h" #include "google_apis/gaia/gaia_constants.h" -#include "grit/locale_settings.h" #include "net/base/url_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/webui/system_info_ui.cc b/chrome/browser/ui/webui/system_info_ui.cc index a8ff82b0ba80cf..108cf95d8f74b5 100644 --- a/chrome/browser/ui/webui/system_info_ui.cc +++ b/chrome/browser/ui/webui/system_info_ui.cc @@ -24,12 +24,12 @@ #include "chrome/common/url_constants.h" #include "chrome/grit/chromium_strings.h" #include "chrome/grit/generated_resources.h" +#include "chrome/grit/locale_settings.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_message_handler.h" #include "grit/browser_resources.h" -#include "grit/locale_settings.h" #include "net/base/directory_lister.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index ad6bf065bf8e1b..a27d9202ae1d51 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -283,7 +283,6 @@ 'includes': [ '../build/grit_action.gypi' ], }, ], - 'includes': [ '../build/grit_target.gypi' ], }, { # GN version: //chrome/app:make_generated_resources_map