diff options
58 files changed, 81 insertions, 79 deletions
diff --git a/chrome/common/DEPS b/chrome/common/DEPS index c019e61..2e5d242 100644 --- a/chrome/common/DEPS +++ b/chrome/common/DEPS @@ -1,6 +1,7 @@ include_rules = [ "+apps/app_shim", # For app shim messages. "+breakpad", # For Breakpad constants. + "+chrome/grit", # For generated headers "+chromeos", # For chromeos_switches.h "+components/autofill/content/common", "+components/autofill/core/common", @@ -18,7 +19,7 @@ include_rules = [ "+components/translate/core/common", "+extensions/common", "+google_apis/gaia", # For gaia_switches.h - "+grit", # For generated headers + "+grit", # For generated headers. TODO(thestig): Remove. "+media", "+ppapi/native_client/src/trusted/plugin/ppapi_entrypoints.h", "+ppapi/shared_impl", diff --git a/chrome/common/attrition_experiments.h b/chrome/common/attrition_experiments.h index 1404b49..56c08b3 100644 --- a/chrome/common/attrition_experiments.h +++ b/chrome/common/attrition_experiments.h @@ -5,7 +5,7 @@ #ifndef CHROME_COMMON_ATTRITION_EXPERIMENTS_H_ #define CHROME_COMMON_ATTRITION_EXPERIMENTS_H_ -#include "grit/chromium_strings.h" +#include "chrome/grit/chromium_strings.h" namespace attrition_experiments { @@ -21,6 +21,6 @@ enum Experiment { // A comma-separated list of brand codes that are associated with Skype. const wchar_t kSkypeBrandCode[] = L"SKPC,SKPG,SKPH,SKPI,SKPL,SKPM,SKPN"; -} // namespace +} // namespace attrition_experiments #endif // CHROME_COMMON_ATTRITION_EXPERIMENTS_H_ diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index cb1e988..3a5452e 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -24,6 +24,7 @@ #include "chrome/common/pepper_flash.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/common_resources.h" #include "components/dom_distiller/core/url_constants.h" #include "components/nacl/common/nacl_process_type.h" #include "content/public/common/content_constants.h" @@ -33,7 +34,6 @@ #include "content/public/common/user_agent.h" #include "extensions/common/constants.h" #include "gpu/config/gpu_info.h" -#include "grit/common_resources.h" #include "ppapi/shared_impl/ppapi_permissions.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" diff --git a/chrome/common/chrome_version_info.cc b/chrome/common/chrome_version_info.cc index c70bf9a..e197bd0 100644 --- a/chrome/common/chrome_version_info.cc +++ b/chrome/common/chrome_version_info.cc @@ -9,8 +9,8 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "build/build_config.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace chrome { diff --git a/chrome/common/extensions/DEPS b/chrome/common/extensions/DEPS index cf4620f..c661eba 100644 --- a/chrome/common/extensions/DEPS +++ b/chrome/common/extensions/DEPS @@ -2,6 +2,8 @@ include_rules = [ "+components/policy/core/common", "+device/bluetooth", # For BluetoothPermission "+device/usb", # For UsbDevicePermission + "+extensions/grit", + "+extensions/strings/grit", "+libxml", "+ppapi/c", # For various types. "+skia", diff --git a/chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc b/chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc index d92d48e..8313cae 100644 --- a/chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc +++ b/chrome/common/extensions/api/bluetooth/bluetooth_manifest_permission.cc @@ -10,11 +10,11 @@ #include "base/values.h" #include "chrome/common/extensions/api/bluetooth/bluetooth_manifest_data.h" #include "chrome/common/extensions/api/manifest_types.h" +#include "chrome/grit/generated_resources.h" #include "device/bluetooth/bluetooth_uuid.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension_messages.h" #include "extensions/common/manifest_constants.h" -#include "grit/generated_resources.h" #include "ipc/ipc_message.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/api/extension_action/browser_action_handler.cc b/chrome/common/extensions/api/extension_action/browser_action_handler.cc index 35bc0a6..af9a80f 100644 --- a/chrome/common/extensions/api/extension_action/browser_action_handler.cc +++ b/chrome/common/extensions/api/extension_action/browser_action_handler.cc @@ -7,12 +7,12 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" #include "extensions/common/file_util.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" -#include "grit/generated_resources.h" namespace extensions { diff --git a/chrome/common/extensions/api/extension_action/page_action_handler.cc b/chrome/common/extensions/api/extension_action/page_action_handler.cc index 6c4a3b2..10a22f1 100644 --- a/chrome/common/extensions/api/extension_action/page_action_handler.cc +++ b/chrome/common/extensions/api/extension_action/page_action_handler.cc @@ -7,10 +7,10 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/extensions/extension_constants.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/extension.h" #include "extensions/common/file_util.h" #include "extensions/common/manifest_constants.h" -#include "grit/generated_resources.h" namespace extensions { diff --git a/chrome/common/extensions/api/plugins/plugins_handler.cc b/chrome/common/extensions/api/plugins/plugins_handler.cc index 8ab0d27..1038d13 100644 --- a/chrome/common/extensions/api/plugins/plugins_handler.cc +++ b/chrome/common/extensions/api/plugins/plugins_handler.cc @@ -8,13 +8,13 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/permissions_parser.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/api_permission_set.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_WIN) diff --git a/chrome/common/extensions/chrome_extensions_client.cc b/chrome/common/extensions/chrome_extensions_client.cc index 929faa2..99c7c85 100644 --- a/chrome/common/extensions/chrome_extensions_client.cc +++ b/chrome/common/extensions/chrome_extensions_client.cc @@ -11,6 +11,8 @@ #include "chrome/common/extensions/features/chrome_channel_feature_filter.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/common_resources.h" +#include "chrome/grit/generated_resources.h" #include "content/public/common/url_constants.h" #include "extensions/common/api/generated_schemas.h" #include "extensions/common/common_manifest_handlers.h" @@ -30,15 +32,14 @@ #include "extensions/common/permissions/permissions_info.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" -#include "grit/common_resources.h" -#if defined(ENABLE_EXTENSIONS) -#include "grit/extensions_api_resources.h" -#endif -#include "grit/extensions_resources.h" -#include "grit/generated_resources.h" +#include "extensions/grit/extensions_resources.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" +#if defined(ENABLE_EXTENSIONS) +#include "chrome/grit/extensions_api_resources.h" +#endif + namespace extensions { namespace { diff --git a/chrome/common/extensions/command.cc b/chrome/common/extensions/command.cc index c325ad5..db68022 100644 --- a/chrome/common/extensions/command.cc +++ b/chrome/common/extensions/command.cc @@ -9,10 +9,10 @@ #include "base/strings/string_split.h" #include "base/strings/string_util.h" #include "base/values.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/common/extensions/manifest_handlers/automation.cc b/chrome/common/extensions/manifest_handlers/automation.cc index f6945ed..b0b795f 100644 --- a/chrome/common/extensions/manifest_handlers/automation.cc +++ b/chrome/common/extensions/manifest_handlers/automation.cc @@ -6,6 +6,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/common/extensions/api/manifest_types.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/error_utils.h" #include "extensions/common/extensions_client.h" #include "extensions/common/manifest_constants.h" @@ -15,7 +16,6 @@ #include "extensions/common/permissions/permission_message_util.h" #include "extensions/common/permissions/permissions_data.h" #include "extensions/common/url_pattern.h" -#include "grit/generated_resources.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_utils.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/manifest_handlers/automation_unittest.cc b/chrome/common/extensions/manifest_handlers/automation_unittest.cc index 0da448f..9da070f 100644 --- a/chrome/common/extensions/manifest_handlers/automation_unittest.cc +++ b/chrome/common/extensions/manifest_handlers/automation_unittest.cc @@ -5,11 +5,11 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/common/extensions/manifest_handlers/automation.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/error_utils.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/extensions_strings.h" -#include "grit/generated_resources.h" +#include "extensions/strings/grit/extensions_strings.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc index d214800..ff5eb90 100644 --- a/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc +++ b/chrome/common/extensions/manifest_handlers/content_scripts_handler.cc @@ -11,6 +11,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "chrome/grit/generated_resources.h" #include "content/public/common/url_constants.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" @@ -20,7 +21,6 @@ #include "extensions/common/permissions/permissions_data.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" diff --git a/chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.cc b/chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.cc index d675d3e..f74ced5 100644 --- a/chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.cc +++ b/chrome/common/extensions/manifest_handlers/minimum_chrome_version_checker.cc @@ -7,10 +7,10 @@ #include "base/strings/utf_string_conversions.h" #include "base/version.h" #include "chrome/common/chrome_version_info.h" +#include "chrome/grit/chromium_strings.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" -#include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/common/extensions/manifest_handlers/theme_handler.cc b/chrome/common/extensions/manifest_handlers/theme_handler.cc index 139cfdd..951ea94 100644 --- a/chrome/common/extensions/manifest_handlers/theme_handler.cc +++ b/chrome/common/extensions/manifest_handlers/theme_handler.cc @@ -8,9 +8,9 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc b/chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc index 291631b..e9a0bc2 100644 --- a/chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc +++ b/chrome/common/extensions/manifest_handlers/ui_overrides_handler.cc @@ -8,6 +8,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension_messages.h" #include "extensions/common/feature_switch.h" @@ -15,7 +16,6 @@ #include "extensions/common/permissions/manifest_permission.h" #include "extensions/common/permissions/permissions_data.h" #include "extensions/common/permissions/permissions_info.h" -#include "grit/generated_resources.h" #include "ipc/ipc_message.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/extensions/manifest_url_handler.cc b/chrome/common/extensions/manifest_url_handler.cc index 5eecd48..be0bea5 100644 --- a/chrome/common/extensions/manifest_url_handler.cc +++ b/chrome/common/extensions/manifest_url_handler.cc @@ -14,6 +14,7 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/error_utils.h" #include "extensions/common/file_util.h" #include "extensions/common/manifest.h" @@ -21,7 +22,6 @@ #include "extensions/common/manifest_handlers/permissions_parser.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/api_permission_set.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #if defined(USE_AURA) diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc index f68b3fb..b9602f24 100644 --- a/chrome/common/extensions/permissions/chrome_api_permissions.cc +++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc @@ -4,13 +4,13 @@ #include "chrome/common/extensions/permissions/chrome_api_permissions.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/api_permission_set.h" #include "extensions/common/permissions/media_galleries_permission.h" #include "extensions/common/permissions/permission_message.h" #include "extensions/common/permissions/permissions_info.h" -#include "grit/extensions_strings.h" -#include "grit/generated_resources.h" +#include "extensions/strings/grit/extensions_strings.h" namespace extensions { diff --git a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc index f281806..a091606 100644 --- a/chrome/common/extensions/permissions/chrome_permission_message_provider.cc +++ b/chrome/common/extensions/permissions/chrome_permission_message_provider.cc @@ -6,13 +6,13 @@ #include "base/stl_util.h" #include "base/strings/stringprintf.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/extensions_client.h" #include "extensions/common/permissions/permission_message.h" #include "extensions/common/permissions/permission_message_util.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/url_pattern.h" #include "extensions/common/url_pattern_set.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc index d270254..6e1123a 100644 --- a/chrome/common/extensions/permissions/permission_set_unittest.cc +++ b/chrome/common/extensions/permissions/permission_set_unittest.cc @@ -12,6 +12,7 @@ #include "chrome/common/extensions/extension_test_util.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/extensions/permissions/chrome_permission_message_provider.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" #include "extensions/common/extension_builder.h" @@ -22,8 +23,7 @@ #include "extensions/common/permissions/permissions_info.h" #include "extensions/common/permissions/socket_permission.h" #include "extensions/common/value_builder.h" -#include "grit/extensions_strings.h" -#include "grit/generated_resources.h" +#include "extensions/strings/grit/extensions_strings.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/importer/firefox_importer_utils.cc b/chrome/common/importer/firefox_importer_utils.cc index 795491a..661315cb 100644 --- a/chrome/common/importer/firefox_importer_utils.cc +++ b/chrome/common/importer/firefox_importer_utils.cc @@ -17,7 +17,7 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/ini_parser.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" diff --git a/chrome/common/importer/firefox_importer_utils_unittest.cc b/chrome/common/importer/firefox_importer_utils_unittest.cc index 987b0e9..95d1d3d 100644 --- a/chrome/common/importer/firefox_importer_utils_unittest.cc +++ b/chrome/common/importer/firefox_importer_utils_unittest.cc @@ -7,7 +7,7 @@ #include "base/file_util.h" #include "base/files/scoped_temp_dir.h" #include "base/values.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/localized_error.cc b/chrome/common/localized_error.cc index 134a160..9419243 100644 --- a/chrome/common/localized_error.cc +++ b/chrome/common/localized_error.cc @@ -12,11 +12,11 @@ #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/net/net_error_info.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/constants.h" #include "extensions/common/extension_icon_set.h" #include "extensions/common/manifest_handlers/icons_handler.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/chrome/common/net/net_resource_provider.cc b/chrome/common/net/net_resource_provider.cc index ee0b9b2..97f4619 100644 --- a/chrome/common/net/net_resource_provider.cc +++ b/chrome/common/net/net_resource_provider.cc @@ -9,9 +9,9 @@ #include "base/i18n/rtl.h" #include "base/strings/string_piece.h" #include "base/values.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" -#include "grit/net_resources.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" +#include "net/grit/net_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/common/net/x509_certificate_model.cc b/chrome/common/net/x509_certificate_model.cc index bfc1192..a7bb46c 100644 --- a/chrome/common/net/x509_certificate_model.cc +++ b/chrome/common/net/x509_certificate_model.cc @@ -9,7 +9,7 @@ #include <algorithm> #include "base/strings/utf_string_conversions.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/common/net/x509_certificate_model_openssl.cc b/chrome/common/net/x509_certificate_model_openssl.cc index d51c036..c553afe 100644 --- a/chrome/common/net/x509_certificate_model_openssl.cc +++ b/chrome/common/net/x509_certificate_model_openssl.cc @@ -16,10 +16,10 @@ #include "base/strings/string_number_conversions.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" +#include "chrome/grit/generated_resources.h" #include "crypto/openssl_bio_string.h" #include "crypto/openssl_util.h" #include "crypto/scoped_openssl_types.h" -#include "grit/generated_resources.h" #include "net/base/net_util.h" #include "net/cert/x509_util_openssl.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/plugin/DEPS b/chrome/plugin/DEPS index 5f0b1b3..0d9fb3e 100644 --- a/chrome/plugin/DEPS +++ b/chrome/plugin/DEPS @@ -1,5 +1,4 @@ include_rules = [ "+content/public/plugin", - "+grit", "+media/base", ] diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS index fe9034a..64d1fe22 100644 --- a/chrome/renderer/DEPS +++ b/chrome/renderer/DEPS @@ -1,4 +1,5 @@ include_rules = [ + "+chrome/grit", # For generated headers "+chrome_elf", "+components/autofill/content/common", "+components/autofill/content/renderer", @@ -21,7 +22,7 @@ include_rules = [ "+extensions/common", "+extensions/renderer", "+gin", - "+grit", # For generated headers + "+grit", # For generated headers. TODO(thestig): Remove. "+ppapi/c", "+ppapi/shared_impl", "+skia", diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc index d2a85a5..a5094ce 100644 --- a/chrome/renderer/chrome_content_renderer_client.cc +++ b/chrome/renderer/chrome_content_renderer_client.cc @@ -28,6 +28,9 @@ #include "chrome/common/pepper_permission_util.h" #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 "chrome/grit/renderer_resources.h" #include "chrome/renderer/benchmarking_extension.h" #include "chrome/renderer/chrome_render_frame_observer.h" #include "chrome/renderer/chrome_render_process_observer.h" @@ -88,9 +91,6 @@ #include "extensions/renderer/dispatcher.h" #include "extensions/renderer/extension_helper.h" #include "extensions/renderer/script_context.h" -#include "grit/generated_resources.h" -#include "grit/locale_settings.h" -#include "grit/renderer_resources.h" #include "ipc/ipc_sync_channel.h" #include "net/base/net_errors.h" #include "ppapi/c/private/ppb_nacl_private.h" diff --git a/chrome/renderer/extensions/app_window_custom_bindings.cc b/chrome/renderer/extensions/app_window_custom_bindings.cc index 53cef26..35dd1bea 100644 --- a/chrome/renderer/extensions/app_window_custom_bindings.cc +++ b/chrome/renderer/extensions/app_window_custom_bindings.cc @@ -8,6 +8,7 @@ #include "base/command_line.h" #include "chrome/common/chrome_switches.h" +#include "chrome/grit/renderer_resources.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/render_view_observer.h" @@ -18,7 +19,6 @@ #include "extensions/renderer/scoped_persistent.h" #include "extensions/renderer/script_context.h" #include "extensions/renderer/script_context_set.h" -#include "grit/renderer_resources.h" #include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebView.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc index 253dd2c..960b675 100644 --- a/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc +++ b/chrome/renderer/extensions/chrome_extensions_dispatcher_delegate.cc @@ -12,6 +12,7 @@ #include "chrome/common/crash_keys.h" #include "chrome/common/extensions/features/feature_channel.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/renderer_resources.h" #include "chrome/renderer/extensions/app_bindings.h" #include "chrome/renderer/extensions/app_window_custom_bindings.h" #include "chrome/renderer/extensions/automation_internal_custom_bindings.h" @@ -40,7 +41,6 @@ #include "extensions/renderer/native_handler.h" #include "extensions/renderer/resource_bundle_source_map.h" #include "extensions/renderer/script_context.h" -#include "grit/renderer_resources.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebSecurityPolicy.h" diff --git a/chrome/renderer/net/net_error_helper.cc b/chrome/renderer/net/net_error_helper.cc index 8ccc64e..b1854d0 100644 --- a/chrome/renderer/net/net_error_helper.cc +++ b/chrome/renderer/net/net_error_helper.cc @@ -16,6 +16,7 @@ #include "chrome/common/localized_error.h" #include "chrome/common/net/net_error_info.h" #include "chrome/common/render_messages.h" +#include "chrome/grit/renderer_resources.h" #include "chrome/renderer/net/net_error_page_controller.h" #include "content/public/common/content_client.h" #include "content/public/common/url_constants.h" @@ -25,7 +26,6 @@ #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "content/public/renderer/resource_fetcher.h" -#include "grit/renderer_resources.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_macros.h" #include "third_party/WebKit/public/platform/WebURL.h" diff --git a/chrome/renderer/net/net_error_helper_core.cc b/chrome/renderer/net/net_error_helper_core.cc index 434a058..9419629 100644 --- a/chrome/renderer/net/net_error_helper_core.cc +++ b/chrome/renderer/net/net_error_helper_core.cc @@ -22,8 +22,8 @@ #include "base/strings/string_util.h" #include "base/values.h" #include "chrome/common/localized_error.h" +#include "chrome/grit/generated_resources.h" #include "content/public/common/url_constants.h" -#include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/chrome/renderer/plugins/DEPS b/chrome/renderer/plugins/DEPS index 3929850..7c86850 100644 --- a/chrome/renderer/plugins/DEPS +++ b/chrome/renderer/plugins/DEPS @@ -1,4 +1,5 @@ include_rules = [ "+gin", "+third_party/widevine", + "+webkit/grit", ] diff --git a/chrome/renderer/plugins/chrome_plugin_placeholder.cc b/chrome/renderer/plugins/chrome_plugin_placeholder.cc index 5b75b89..ae6989a 100644 --- a/chrome/renderer/plugins/chrome_plugin_placeholder.cc +++ b/chrome/renderer/plugins/chrome_plugin_placeholder.cc @@ -8,6 +8,8 @@ #include "base/values.h" #include "chrome/common/prerender_messages.h" #include "chrome/common/render_messages.h" +#include "chrome/grit/generated_resources.h" +#include "chrome/grit/renderer_resources.h" #include "chrome/renderer/chrome_content_renderer_client.h" #include "chrome/renderer/custom_menu_commands.h" #include "chrome/renderer/plugins/plugin_uma.h" @@ -17,8 +19,6 @@ #include "content/public/renderer/render_thread.h" #include "gin/handle.h" #include "gin/object_template_builder.h" -#include "grit/generated_resources.h" -#include "grit/renderer_resources.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebInputEvent.h" #include "third_party/WebKit/public/web/WebKit.h" diff --git a/chrome/renderer/printing/print_web_view_helper.cc b/chrome/renderer/printing/print_web_view_helper.cc index 777eb69..e4129ee 100644 --- a/chrome/renderer/printing/print_web_view_helper.cc +++ b/chrome/renderer/printing/print_web_view_helper.cc @@ -19,12 +19,12 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/print_messages.h" #include "chrome/common/render_messages.h" +#include "chrome/grit/browser_resources.h" #include "chrome/renderer/prerender/prerender_helper.h" #include "content/public/common/web_preferences.h" #include "content/public/renderer/render_frame.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" -#include "grit/browser_resources.h" #include "net/base/escape.h" #include "printing/metafile.h" #include "printing/metafile_impl.h" diff --git a/chrome/renderer/searchbox/searchbox_extension.cc b/chrome/renderer/searchbox/searchbox_extension.cc index c949667..a9030b88 100644 --- a/chrome/renderer/searchbox/searchbox_extension.cc +++ b/chrome/renderer/searchbox/searchbox_extension.cc @@ -13,10 +13,10 @@ #include "chrome/common/instant_types.h" #include "chrome/common/ntp_logging_events.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/renderer_resources.h" #include "chrome/renderer/searchbox/searchbox.h" #include "content/public/renderer/render_view.h" #include "extensions/common/extension.h" -#include "grit/renderer_resources.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebLocalFrame.h" diff --git a/chrome/renderer/security_filter_peer.cc b/chrome/renderer/security_filter_peer.cc index 4a2ad8b..ce8c5bc 100644 --- a/chrome/renderer/security_filter_peer.cc +++ b/chrome/renderer/security_filter_peer.cc @@ -6,7 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "base/strings/stringprintf.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/service/DEPS b/chrome/service/DEPS index be16d49..23e8fba 100644 --- a/chrome/service/DEPS +++ b/chrome/service/DEPS @@ -1,4 +1,3 @@ include_rules = [ - # For generated headers. - "+grit", + "+chrome/grit", # For generated headers. ] diff --git a/chrome/service/cloud_print/cloud_print_connector.cc b/chrome/service/cloud_print/cloud_print_connector.cc index cdda363..4abc4b4 100644 --- a/chrome/service/cloud_print/cloud_print_connector.cc +++ b/chrome/service/cloud_print/cloud_print_connector.cc @@ -16,8 +16,8 @@ #include "base/values.h" #include "chrome/common/cloud_print/cloud_print_constants.h" #include "chrome/common/cloud_print/cloud_print_helpers.h" +#include "chrome/grit/generated_resources.h" #include "chrome/service/cloud_print/cloud_print_service_helpers.h" -#include "grit/generated_resources.h" #include "net/base/mime_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/service/cloud_print/printer_job_handler.cc b/chrome/service/cloud_print/printer_job_handler.cc index f92ca1b..b53c13c3 100644 --- a/chrome/service/cloud_print/printer_job_handler.cc +++ b/chrome/service/cloud_print/printer_job_handler.cc @@ -15,9 +15,9 @@ #include "base/values.h" #include "chrome/common/cloud_print/cloud_print_constants.h" #include "chrome/common/cloud_print/cloud_print_helpers.h" +#include "chrome/grit/generated_resources.h" #include "chrome/service/cloud_print/cloud_print_service_helpers.h" #include "chrome/service/cloud_print/job_status_updater.h" -#include "grit/generated_resources.h" #include "net/base/mime_util.h" #include "net/http/http_response_headers.h" #include "net/http/http_status_code.h" diff --git a/chrome/service/service_process.cc b/chrome/service/service_process.cc index d6cb9d4..44f0318 100644 --- a/chrome/service/service_process.cc +++ b/chrome/service/service_process.cc @@ -23,12 +23,12 @@ #include "chrome/common/env_vars.h" #include "chrome/common/pref_names.h" #include "chrome/common/service_process_util.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "chrome/service/cloud_print/cloud_print_proxy.h" #include "chrome/service/net/service_url_request_context_getter.h" #include "chrome/service/service_ipc_server.h" #include "chrome/service/service_process_prefs.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "net/base/network_change_notifier.h" #include "net/url_request/url_fetcher.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/test/DEPS b/chrome/test/DEPS index a3fac31..db5b57f 100644 --- a/chrome/test/DEPS +++ b/chrome/test/DEPS @@ -3,6 +3,7 @@ include_rules = [ # rely on components. "+ash", "+chrome", + "+chrome/grit", # For generated headers "+chromeos", "+components", "+extensions", @@ -15,7 +16,7 @@ include_rules = [ "+content/public", "+gin/public", - "+grit", # For generated headers + "+grit", # For generated headers. TODO(thestig): Remove. "+media/base", "+mojo/embedder", "+sandbox/win/tests", diff --git a/chrome/test/gpu/webgl_infobar_browsertest.cc b/chrome/test/gpu/webgl_infobar_browsertest.cc index 300a73f..e9e1712 100644 --- a/chrome/test/gpu/webgl_infobar_browsertest.cc +++ b/chrome/test/gpu/webgl_infobar_browsertest.cc @@ -14,6 +14,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/theme_resources.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/test_launcher_utils.h" #include "chrome/test/base/test_switches.h" @@ -27,7 +28,6 @@ #include "content/public/common/page_transition_types.h" #include "content/public/test/browser_test_utils.h" #include "gpu/config/gpu_test_config.h" -#include "grit/theme_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gl/gl_implementation.h" diff --git a/chrome/third_party/mozilla_security_manager/DEPS b/chrome/third_party/mozilla_security_manager/DEPS index fac79a6..d51a9ba 100644 --- a/chrome/third_party/mozilla_security_manager/DEPS +++ b/chrome/third_party/mozilla_security_manager/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+grit", # For generated headers + "+chrome/grit", # For generated headers ] diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp index 58f7008..d04aca0 100644 --- a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp +++ b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp @@ -52,7 +52,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/common/net/x509_certificate_model.h" #include "crypto/scoped_nss_types.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "net/base/ip_endpoint.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp b/chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp index d4a58ab..f02a88a 100644 --- a/chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp +++ b/chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp @@ -42,7 +42,7 @@ #include <pk11func.h> -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace mozilla_security_manager { diff --git a/chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.cpp b/chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.cpp index 0104468..1dbcb338 100644 --- a/chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.cpp +++ b/chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.cpp @@ -37,7 +37,7 @@ #include "chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace mozilla_security_manager { diff --git a/chrome/tools/mac_helpers/DEPS b/chrome/tools/mac_helpers/DEPS index fac79a6..d51a9ba 100644 --- a/chrome/tools/mac_helpers/DEPS +++ b/chrome/tools/mac_helpers/DEPS @@ -1,3 +1,3 @@ include_rules = [ - "+grit", # For generated headers + "+chrome/grit", # For generated headers ] diff --git a/chrome/tools/mac_helpers/infoplist_strings_util.mm b/chrome/tools/mac_helpers/infoplist_strings_util.mm index 1655e0d..4b09208 100644 --- a/chrome/tools/mac_helpers/infoplist_strings_util.mm +++ b/chrome/tools/mac_helpers/infoplist_strings_util.mm @@ -20,7 +20,7 @@ #include "base/strings/string_util.h" #include "base/strings/string_util.h" #include "base/strings/sys_string_conversions.h" -#include "grit/chromium_strings.h" +#include "chrome/grit/chromium_strings.h" #include "ui/base/resource/data_pack.h" namespace { diff --git a/chrome/utility/DEPS b/chrome/utility/DEPS index 17ebb35..14e3a28 100644 --- a/chrome/utility/DEPS +++ b/chrome/utility/DEPS @@ -1,13 +1,10 @@ include_rules = [ + "+chrome/grit", # For generated headers. "+content/public/child", "+content/public/utility", "+components/wifi", "+courgette", "+extensions/common", - - # For generated headers. - "+grit", - "+skia/ext", "+media", "+third_party/zlib/google", diff --git a/chrome/utility/extensions/unpacker.cc b/chrome/utility/extensions/unpacker.cc index 2e7ad9e..523bec3 100644 --- a/chrome/utility/extensions/unpacker.cc +++ b/chrome/utility/extensions/unpacker.cc @@ -19,6 +19,7 @@ #include "chrome/common/chrome_utility_messages.h" #include "chrome/common/extensions/api/i18n/default_locale_handler.h" #include "chrome/common/extensions/extension_file_util.h" +#include "chrome/grit/generated_resources.h" #include "content/public/child/image_decoder_utils.h" #include "content/public/common/common_param_traits.h" #include "extensions/common/constants.h" @@ -27,7 +28,6 @@ #include "extensions/common/file_util.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_constants.h" -#include "grit/generated_resources.h" #include "ipc/ipc_message_utils.h" #include "net/base/file_stream.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/utility/importer/DEPS b/chrome/utility/importer/DEPS index 4b97148..29165e3 100644 --- a/chrome/utility/importer/DEPS +++ b/chrome/utility/importer/DEPS @@ -1,4 +1,4 @@ include_rules = [ - # For PasswordForm. - "+components/autofill/core/common", + "+components/autofill/core/common", # For PasswordForm. + "+components/strings/grit", ] diff --git a/chrome/utility/importer/bookmarks_file_importer.cc b/chrome/utility/importer/bookmarks_file_importer.cc index f69c9b6..387257d 100644 --- a/chrome/utility/importer/bookmarks_file_importer.cc +++ b/chrome/utility/importer/bookmarks_file_importer.cc @@ -10,10 +10,10 @@ #include "chrome/common/importer/importer_bridge.h" #include "chrome/common/importer/importer_data_types.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "chrome/utility/importer/bookmark_html_reader.h" #include "components/url_fixer/url_fixer.h" #include "content/public/common/url_constants.h" -#include "grit/generated_resources.h" namespace { diff --git a/chrome/utility/importer/firefox_importer.cc b/chrome/utility/importer/firefox_importer.cc index a682dbd..8b216bdc 100644 --- a/chrome/utility/importer/firefox_importer.cc +++ b/chrome/utility/importer/firefox_importer.cc @@ -20,11 +20,11 @@ #include "chrome/common/importer/imported_favicon_usage.h" #include "chrome/common/importer/importer_bridge.h" #include "chrome/common/importer/importer_url_row.h" +#include "chrome/grit/generated_resources.h" #include "chrome/utility/importer/bookmark_html_reader.h" #include "chrome/utility/importer/favicon_reencode.h" #include "chrome/utility/importer/nss_decryptor.h" #include "components/autofill/core/common/password_form.h" -#include "grit/generated_resources.h" #include "sql/connection.h" #include "sql/statement.h" #include "url/gurl.h" diff --git a/chrome/utility/importer/ie_importer_win.cc b/chrome/utility/importer/ie_importer_win.cc index 1376ac9..ccdcb1a 100644 --- a/chrome/utility/importer/ie_importer_win.cc +++ b/chrome/utility/importer/ie_importer_win.cc @@ -36,9 +36,9 @@ #include "chrome/common/importer/importer_data_types.h" #include "chrome/common/importer/importer_url_row.h" #include "chrome/common/importer/pstore_declarations.h" +#include "chrome/grit/generated_resources.h" #include "chrome/utility/importer/favicon_reencode.h" #include "components/autofill/core/common/password_form.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" #include "url/url_constants.h" diff --git a/chrome/utility/importer/safari_importer.mm b/chrome/utility/importer/safari_importer.mm index d9c0455..c56b33f 100644 --- a/chrome/utility/importer/safari_importer.mm +++ b/chrome/utility/importer/safari_importer.mm @@ -20,8 +20,8 @@ #include "chrome/common/importer/importer_bridge.h" #include "chrome/common/url_constants.h" #include "chrome/utility/importer/favicon_reencode.h" -#include "grit/components_strings.h" -#include "grit/generated_resources.h" +#include "components/strings/grit/components_strings.h" +#include "chrome/grit/generated_resources.h" #include "net/base/data_url.h" #include "sql/statement.h" #include "url/gurl.h" |