diff options
32 files changed, 45 insertions, 41 deletions
diff --git a/athena/resources/athena_resources.gyp b/athena/resources/athena_resources.gyp index 84dd976..69176d0 100644 --- a/athena/resources/athena_resources.gyp +++ b/athena/resources/athena_resources.gyp @@ -45,8 +45,8 @@ '<(PRODUCT_DIR)/extensions_shell_and_test.pak', '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/athena/resources/athena_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/components/component_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/components/component_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak', '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resources_100_percent.pak', diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index 423aa5b..bb7a670 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -334,7 +334,7 @@ repack("packed_extra_resources") { "$root_gen_dir/chrome/browser/resources/signin_internals_resources.pak", "$root_gen_dir/chrome/browser/resources/sync_internals_resources.pak", "$root_gen_dir/chrome/browser/resources/translate_internals_resources.pak", - "$root_gen_dir/components/resources/component_resources.pak", + "$root_gen_dir/components/resources/components_resources.pak", "$root_gen_dir/net/net_resources.pak", "$root_gen_dir/ui/resources/webui_resources.pak", ] @@ -451,7 +451,7 @@ template("chrome_repack_percent") { visibility = [ ":$copy_name" ] # All sources should also have deps for completeness. sources = [ - "$root_gen_dir/components/resources/component_resources_${percent}_percent.pak", + "$root_gen_dir/components/resources/components_resources_${percent}_percent.pak", "$root_gen_dir/ui/resources/ui_resources_${percent}_percent.pak", "$root_gen_dir/chrome/renderer_resources_${percent}_percent.pak", "$root_gen_dir/chrome/app/theme/theme_resources_${percent}_percent.pak", diff --git a/chrome/browser/ui/app_list/search/search_controller.cc b/chrome/browser/ui/app_list/search/search_controller.cc index f53ed28..6a3fb4e 100644 --- a/chrome/browser/ui/app_list/search/search_controller.cc +++ b/chrome/browser/ui/app_list/search/search_controller.cc @@ -26,7 +26,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/grit/generated_resources.h" #include "content/public/browser/user_metrics.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "grit/theme_resources.h" #include "ui/app_list/search_box_model.h" #include "ui/app_list/speech_ui_model.h" diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc index 7e0c35c..42cd3e0 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.cc @@ -78,7 +78,7 @@ #include "extensions/browser/app_window/app_window.h" #include "extensions/browser/app_window/app_window_registry.h" #include "extensions/browser/app_window/native_app_window.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "grit/components_strings.h" #include "grit/platform_locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc index 15bedb9..a190d26 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc @@ -53,7 +53,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/test/mock_render_process_host.h" #include "google_apis/gaia/google_service_auth_error.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "grit/components_strings.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc index b9458b8..72e6c2b 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc +++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.cc @@ -14,7 +14,7 @@ #include "components/autofill/core/browser/autofill_popup_delegate.h" #include "components/autofill/core/browser/popup_item_ids.h" #include "content/public/browser/native_web_keyboard_event.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/events/event.h" #include "ui/gfx/rect_conversions.h" diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc index e0e4f85..4755ad4 100644 --- a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc +++ b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc @@ -19,7 +19,7 @@ #include "components/autofill/core/browser/popup_item_ids.h" #include "components/autofill/core/browser/test_autofill_client.h" #include "components/autofill/core/browser/test_autofill_external_delegate.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index ce60ce6..f31b5e9 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -67,7 +67,7 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "skia/ext/skia_utils_mac.h" diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc index 00a07ac..e4313c8 100644 --- a/chrome/browser/ui/libgtk2ui/gtk2_ui.cc +++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.cc @@ -33,7 +33,7 @@ #include "chrome/browser/ui/libgtk2ui/skia_utils_gtk2.h" #include "chrome/browser/ui/libgtk2ui/unity_service.h" #include "chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "grit/theme_resources.h" #include "printing/printing_context_linux.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/ui/omnibox/omnibox_view.cc b/chrome/browser/ui/omnibox/omnibox_view.cc index cc4d1b9..0571a09 100644 --- a/chrome/browser/ui/omnibox/omnibox_view.cc +++ b/chrome/browser/ui/omnibox/omnibox_view.cc @@ -18,7 +18,7 @@ #include "components/omnibox/autocomplete_match.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "grit/theme_resources.h" #include "ui/base/clipboard/clipboard.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/ui/toolbar/toolbar_model_impl.cc b/chrome/browser/ui/toolbar/toolbar_model_impl.cc index c80a147..0be1a71 100644 --- a/chrome/browser/ui/toolbar/toolbar_model_impl.cc +++ b/chrome/browser/ui/toolbar/toolbar_model_impl.cc @@ -29,7 +29,7 @@ #include "content/public/browser/web_ui.h" #include "content/public/common/content_constants.h" #include "content/public/common/ssl_status.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "net/cert/cert_status_flags.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index 2d5a240..1eee3d1 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -69,7 +69,7 @@ #include "extensions/browser/extension_registry.h" #include "extensions/common/feature_switch.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "grit/theme_resources.h" #include "ui/accessibility/ax_view_state.h" #include "ui/base/dragdrop/drag_drop_types.h" diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc index 0dbf534..81f548d 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc @@ -21,7 +21,7 @@ #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" #include "chrome/grit/generated_resources.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/theme_provider.h" diff --git a/chrome/chrome_repack_chrome_100_percent.gypi b/chrome/chrome_repack_chrome_100_percent.gypi index e0d60be..0f7d8e7 100644 --- a/chrome/chrome_repack_chrome_100_percent.gypi +++ b/chrome/chrome_repack_chrome_100_percent.gypi @@ -6,7 +6,7 @@ 'action_name': 'repack_chrome_resources_100_percent', 'variables': { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/component_resources_100_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak', '<(grit_out_dir)/renderer_resources_100_percent.pak', '<(grit_out_dir)/theme_resources_100_percent.pak', diff --git a/chrome/chrome_repack_chrome_200_percent.gypi b/chrome/chrome_repack_chrome_200_percent.gypi index bf5f490..f8ea76c 100644 --- a/chrome/chrome_repack_chrome_200_percent.gypi +++ b/chrome/chrome_repack_chrome_200_percent.gypi @@ -6,7 +6,7 @@ 'action_name': 'repack_chrome_resources_200_percent', 'variables': { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/component_resources_200_percent.pak', + '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_200_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent.pak', '<(grit_out_dir)/renderer_resources_200_percent.pak', '<(grit_out_dir)/theme_resources_200_percent.pak', diff --git a/chrome/chrome_repack_resources.gypi b/chrome/chrome_repack_resources.gypi index 01b7834..1d7e485 100644 --- a/chrome/chrome_repack_resources.gypi +++ b/chrome/chrome_repack_resources.gypi @@ -6,7 +6,7 @@ 'variables': { 'pak_inputs': [ '<(SHARED_INTERMEDIATE_DIR)/chrome/chrome_unscaled_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/components/component_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak', '<(grit_out_dir)/browser_resources.pak', diff --git a/chrome/renderer/translate/translate_script_browsertest.cc b/chrome/renderer/translate/translate_script_browsertest.cc index 5de838b..1e35adb 100644 --- a/chrome/renderer/translate/translate_script_browsertest.cc +++ b/chrome/renderer/translate/translate_script_browsertest.cc @@ -6,7 +6,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/test/base/chrome_render_view_test.h" #include "components/translate/core/common/translate_errors.h" -#include "grit/component_resources.h" +#include "grit/components_resources.h" #include "third_party/WebKit/public/web/WebLocalFrame.h" #include "third_party/WebKit/public/web/WebScriptSource.h" #include "ui/base/resource/resource_bundle.h" diff --git a/components/autofill/content/browser/wallet/wallet_items.cc b/components/autofill/content/browser/wallet/wallet_items.cc index d9a45d1..2687390 100644 --- a/components/autofill/content/browser/wallet/wallet_items.cc +++ b/components/autofill/content/browser/wallet/wallet_items.cc @@ -13,7 +13,7 @@ #include "components/autofill/content/browser/wallet/gaia_account.h" #include "components/autofill/core/browser/autofill_type.h" #include "components/autofill/core/browser/credit_card.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "grit/components_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/components/autofill/core/browser/credit_card.cc b/components/autofill/core/browser/credit_card.cc index ee4aa1e..2878142 100644 --- a/components/autofill/core/browser/credit_card.cc +++ b/components/autofill/core/browser/credit_card.cc @@ -24,7 +24,7 @@ #include "components/autofill/core/browser/autofill_type.h" #include "components/autofill/core/browser/validation.h" #include "components/autofill/core/common/form_field_data.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "grit/components_strings.h" #include "third_party/icu/source/common/unicode/uloc.h" #include "third_party/icu/source/i18n/unicode/dtfmtsym.h" diff --git a/components/autofill/core/browser/credit_card_unittest.cc b/components/autofill/core/browser/credit_card_unittest.cc index 28823fb..7171110 100644 --- a/components/autofill/core/browser/credit_card_unittest.cc +++ b/components/autofill/core/browser/credit_card_unittest.cc @@ -10,7 +10,7 @@ #include "components/autofill/core/browser/credit_card.h" #include "components/autofill/core/browser/validation.h" #include "components/autofill/core/common/form_field_data.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "testing/gtest/include/gtest/gtest.h" using base::ASCIIToUTF16; diff --git a/components/components_tests.gyp b/components/components_tests.gyp index 2fd337d..8d9721b 100644 --- a/components/components_tests.gyp +++ b/components/components_tests.gyp @@ -890,7 +890,7 @@ 'action_name': 'repack_components_pack', 'variables': { 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/components/component_resources.pak', + '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak', ], 'pak_output': '<(PRODUCT_DIR)/components_resources.pak', diff --git a/components/dom_distiller/core/distiller_page.cc b/components/dom_distiller/core/distiller_page.cc index 55364ce..94c37ae 100644 --- a/components/dom_distiller/core/distiller_page.cc +++ b/components/dom_distiller/core/distiller_page.cc @@ -12,7 +12,7 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/time/time.h" -#include "grit/component_resources.h" +#include "grit/components_resources.h" #include "third_party/dom_distiller_js/dom_distiller.pb.h" #include "third_party/dom_distiller_js/dom_distiller_json_converter.h" #include "ui/base/resource/resource_bundle.h" diff --git a/components/dom_distiller/core/url_utils.cc b/components/dom_distiller/core/url_utils.cc index 1a7545b..6562096 100644 --- a/components/dom_distiller/core/url_utils.cc +++ b/components/dom_distiller/core/url_utils.cc @@ -8,7 +8,7 @@ #include "base/guid.h" #include "components/dom_distiller/core/url_constants.h" -#include "grit/component_resources.h" +#include "grit/components_resources.h" #include "net/base/url_util.h" #include "ui/base/resource/resource_bundle.h" #include "url/gurl.h" diff --git a/components/dom_distiller/core/viewer.cc b/components/dom_distiller/core/viewer.cc index 57d5473..b3bc0a5 100644 --- a/components/dom_distiller/core/viewer.cc +++ b/components/dom_distiller/core/viewer.cc @@ -17,7 +17,7 @@ #include "components/dom_distiller/core/task_tracker.h" #include "components/dom_distiller/core/url_constants.h" #include "components/dom_distiller/core/url_utils.h" -#include "grit/component_resources.h" +#include "grit/components_resources.h" #include "grit/components_strings.h" #include "net/base/escape.h" #include "net/url_request/url_request.h" diff --git a/components/dom_distiller/webui/dom_distiller_ui.cc b/components/dom_distiller/webui/dom_distiller_ui.cc index 436e6574..5396816 100644 --- a/components/dom_distiller/webui/dom_distiller_ui.cc +++ b/components/dom_distiller/webui/dom_distiller_ui.cc @@ -11,7 +11,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" -#include "grit/component_resources.h" +#include "grit/components_resources.h" #include "grit/components_strings.h" namespace dom_distiller { diff --git a/components/omnibox/autocomplete_match.cc b/components/omnibox/autocomplete_match.cc index 8a73913..558ed93 100644 --- a/components/omnibox/autocomplete_match.cc +++ b/components/omnibox/autocomplete_match.cc @@ -14,7 +14,7 @@ #include "components/omnibox/autocomplete_provider.h" #include "components/search_engines/template_url.h" #include "components/search_engines/template_url_service.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" namespace { diff --git a/components/pdf/renderer/DEPS b/components/pdf/renderer/DEPS index ee0d845..42effda 100644 --- a/components/pdf/renderer/DEPS +++ b/components/pdf/renderer/DEPS @@ -1,6 +1,6 @@ include_rules = [ "+components/strings/grit/components_strings.h", - "+grit/component_scaled_resources.h", + "+grit/components_scaled_resources.h", "+skia/ext", "+ui/gfx", ] diff --git a/components/pdf/renderer/pdf_resource_util.cc b/components/pdf/renderer/pdf_resource_util.cc index 4a3a9fd..73907cf 100644 --- a/components/pdf/renderer/pdf_resource_util.cc +++ b/components/pdf/renderer/pdf_resource_util.cc @@ -6,7 +6,7 @@ #include "base/strings/utf_string_conversions.h" #include "components/strings/grit/components_strings.h" -#include "grit/component_scaled_resources.h" +#include "grit/components_scaled_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/components/resources/BUILD.gn b/components/resources/BUILD.gn index 28d1755..b6e027c 100644 --- a/components/resources/BUILD.gn +++ b/components/resources/BUILD.gn @@ -16,9 +16,11 @@ group("resources") { # (generate_components_resources action) grit("components_resources") { source = "components_resources.grd" + # TODO(hashimoto): Remove this line. + output_name = "components_resources_new" outputs = [ - "grit/component_resources.h", - "component_resources.pak", + "grit/components_resources.h", + "components_resources.pak", ] } @@ -26,9 +28,11 @@ grit("components_resources") { # (generate_scaled_components_resources action) grit("components_scaled_resources") { source = "components_scaled_resources.grd" + # TODO(hashimoto): Remove this line. + output_name = "components_scaled_resources_new" outputs = [ - "grit/component_scaled_resources.h", - "component_resources_100_percent.pak", - "component_resources_200_percent.pak", + "grit/components_scaled_resources.h", + "components_resources_100_percent.pak", + "components_resources_200_percent.pak", ] } diff --git a/components/resources/components_resources.grd b/components/resources/components_resources.grd index 23fb025..c9b2312 100644 --- a/components/resources/components_resources.grd +++ b/components/resources/components_resources.grd @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <grit latest_public_release="0" current_release="1"> <outputs> - <output filename="grit/component_resources.h" type="rc_header"> + <output filename="grit/components_resources.h" type="rc_header"> <emit emit_type='prepend'></emit> </output> - <output filename="component_resources.pak" type="data_package" /> + <output filename="components_resources.pak" type="data_package" /> </outputs> <release seq="1"> <includes> diff --git a/components/resources/components_scaled_resources.grd b/components/resources/components_scaled_resources.grd index 0737836..4800748 100644 --- a/components/resources/components_scaled_resources.grd +++ b/components/resources/components_scaled_resources.grd @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <grit latest_public_release="0" current_release="1"> <outputs> - <output filename="grit/component_scaled_resources.h" type="rc_header" context="default_100_percent"> + <output filename="grit/components_scaled_resources.h" type="rc_header" context="default_100_percent"> <emit emit_type='prepend'></emit> </output> - <output filename="component_resources_100_percent.pak" type="data_package" context="default_100_percent" /> - <output filename="component_resources_200_percent.pak" type="data_package" context="default_200_percent" /> + <output filename="components_resources_100_percent.pak" type="data_package" context="default_100_percent" /> + <output filename="components_resources_200_percent.pak" type="data_package" context="default_200_percent" /> </outputs> <release seq="1"> <structures fallback_to_low_resolution="true"> diff --git a/components/translate/core/browser/translate_script.cc b/components/translate/core/browser/translate_script.cc index 3edff69..a3c18eb 100644 --- a/components/translate/core/browser/translate_script.cc +++ b/components/translate/core/browser/translate_script.cc @@ -16,7 +16,7 @@ #include "components/translate/core/common/translate_switches.h" #include "components/translate/core/common/translate_util.h" #include "google_apis/google_api_keys.h" -#include "grit/component_resources.h" +#include "grit/components_resources.h" #include "net/base/escape.h" #include "net/base/url_util.h" #include "ui/base/resource/resource_bundle.h" |