diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 10:18:18 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-22 10:20:07 +0000 |
| commit | af39f00e1d36360ab4119b873f2a9cc961d4464b (patch) | |
| tree | cb520de46867506827af3cd9ac71c55cfc323f75 /chrome | |
| parent | 0a0291c65f3cc23cc1b5a3c211019fce1d8ab007 (diff) | |
| download | chromium_src-af39f00e1d36360ab4119b873f2a9cc961d4464b.zip chromium_src-af39f00e1d36360ab4119b873f2a9cc961d4464b.tar.gz chromium_src-af39f00e1d36360ab4119b873f2a9cc961d4464b.tar.bz2 | |
Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 1)
BUG=401588
Review URL: https://codereview.chromium.org/469993006
Cr-Commit-Position: refs/heads/master@{#291367}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291367 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
181 files changed, 219 insertions, 220 deletions
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index e7e1f0dd..018e682 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -23,6 +23,7 @@ #include "chrome/browser/flags_storage.h" #include "chrome/common/chrome_content_client.h" #include "chrome/common/chrome_switches.h" +#include "chrome/grit/generated_resources.h" #include "components/autofill/core/common/autofill_switches.h" #include "components/cloud_devices/common/cloud_devices_switches.h" #include "components/metrics/metrics_hashes.h" @@ -30,7 +31,6 @@ #include "components/search/search_switches.h" #include "content/public/browser/user_metrics.h" #include "extensions/common/switches.h" -#include "grit/generated_resources.h" #include "media/base/media_switches.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/ui_base_switches.h" diff --git a/chrome/browser/about_flags_unittest.cc b/chrome/browser/about_flags_unittest.cc index bb3d522..6e0c938 100644 --- a/chrome/browser/about_flags_unittest.cc +++ b/chrome/browser/about_flags_unittest.cc @@ -17,7 +17,7 @@ #include "chrome/browser/pref_service_flags_storage.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" -#include "grit/chromium_strings.h" +#include "chrome/grit/chromium_strings.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/libxml/chromium/libxml_utils.h" diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 6c5f2bb..ac2a19e 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -77,8 +77,10 @@ #include "chrome/common/mac/app_mode_common.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" -#include "components/signin/core/common/profile_management_switches.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "components/signin/core/browser/signin_manager.h" +#include "components/signin/core/common/profile_management_switches.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/notification_service.h" @@ -86,8 +88,6 @@ #include "content/public/browser/plugin_service.h" #include "content/public/browser/user_metrics.h" #include "extensions/browser/extension_system.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "net/base/filename_util.h" #include "ui/base/cocoa/focus_window_set.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc index 7d13104..7d4b089 100644 --- a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc +++ b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc @@ -6,6 +6,8 @@ #include "base/logging.h" #include "chrome/browser/infobars/infobar_service.h" +#include "chrome/grit/generated_resources.h" +#include "chrome/grit/google_chrome_strings.h" #include "components/autofill/core/browser/credit_card.h" #include "components/autofill/core/browser/personal_data_manager.h" #include "components/autofill/core/common/autofill_constants.h" @@ -13,8 +15,6 @@ #include "content/public/browser/page_navigator.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" -#include "grit/generated_resources.h" -#include "grit/google_chrome_strings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/background/background_contents_service.cc b/chrome/browser/background/background_contents_service.cc index 27650a0..691bc63 100644 --- a/chrome/browser/background/background_contents_service.cc +++ b/chrome/browser/background/background_contents_service.cc @@ -32,6 +32,7 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" @@ -46,7 +47,6 @@ #include "extensions/common/extension_set.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/manifest_handlers/icons_handler.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ipc/ipc_message.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/background/background_mode_manager.cc b/chrome/browser/background/background_mode_manager.cc index d446626bc..9ebdaea 100644 --- a/chrome/browser/background/background_mode_manager.cc +++ b/chrome/browser/background/background_mode_manager.cc @@ -38,14 +38,14 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" #include "grit/chrome_unscaled_resources.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/background/background_mode_manager_aura.cc b/chrome/browser/background/background_mode_manager_aura.cc index 459a7cb..3cdd1ad 100644 --- a/chrome/browser/background/background_mode_manager_aura.cc +++ b/chrome/browser/background/background_mode_manager_aura.cc @@ -4,8 +4,8 @@ #include "chrome/browser/background/background_mode_manager.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/extension.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" // No background jobs for aura for now. diff --git a/chrome/browser/background/background_mode_manager_chromeos.cc b/chrome/browser/background/background_mode_manager_chromeos.cc index 9c83dbd..c90fa6b 100644 --- a/chrome/browser/background/background_mode_manager_chromeos.cc +++ b/chrome/browser/background/background_mode_manager_chromeos.cc @@ -4,8 +4,8 @@ #include "chrome/browser/background/background_mode_manager.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/extension.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" void BackgroundModeManager::EnableLaunchOnStartup(bool should_launch) { diff --git a/chrome/browser/background/background_mode_manager_mac.mm b/chrome/browser/background/background_mode_manager_mac.mm index 68fa906..51e5d52 100644 --- a/chrome/browser/background/background_mode_manager_mac.mm +++ b/chrome/browser/background/background_mode_manager_mac.mm @@ -10,8 +10,8 @@ #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using content::BrowserThread; diff --git a/chrome/browser/background/background_mode_manager_win.cc b/chrome/browser/background/background_mode_manager_win.cc index 4dd0728..302db4f 100644 --- a/chrome/browser/background/background_mode_manager_win.cc +++ b/chrome/browser/background/background_mode_manager_win.cc @@ -12,10 +12,10 @@ #include "base/win/registry.h" #include "chrome/browser/background/background_mode_manager.h" #include "chrome/common/chrome_switches.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "chrome/installer/util/auto_launch_util.h" #include "content/public/browser/browser_thread.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/browsing_data/cookies_tree_model.cc b/chrome/browser/browsing_data/cookies_tree_model.cc index c2e91d7..e988668 100644 --- a/chrome/browser/browsing_data/cookies_tree_model.cc +++ b/chrome/browser/browsing_data/cookies_tree_model.cc @@ -17,8 +17,8 @@ #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h" #include "chrome/browser/browsing_data/browsing_data_flash_lso_helper.h" #include "chrome/browser/content_settings/cookie_settings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/common/url_constants.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" #include "net/cookies/canonical_cookie.h" diff --git a/chrome/browser/certificate_manager_model.cc b/chrome/browser/certificate_manager_model.cc index a168923..e932883 100644 --- a/chrome/browser/certificate_manager_model.cc +++ b/chrome/browser/certificate_manager_model.cc @@ -11,11 +11,11 @@ #include "chrome/browser/net/nss_context.h" #include "chrome/browser/ui/crypto_module_password_dialog_nss.h" #include "chrome/common/net/x509_certificate_model.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/resource_context.h" #include "crypto/nss_util.h" -#include "grit/generated_resources.h" #include "net/base/crypto_module.h" #include "net/base/net_errors.h" #include "net/cert/x509_certificate.h" diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index 3d78bae..e01c27d 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -13,8 +13,8 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" -#include "grit/generated_resources.h" #include "third_party/icu/source/common/unicode/ucnv.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_collator.h" diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc index a273d78..e869248 100644 --- a/chrome/browser/chrome_browser_main.cc +++ b/chrome/browser/chrome_browser_main.cc @@ -101,6 +101,7 @@ #include "chrome/common/net/net_resource_provider.h" #include "chrome/common/pref_names.h" #include "chrome/common/profiling.h" +#include "chrome/grit/generated_resources.h" #include "chrome/installer/util/google_update_settings.h" #include "components/component_updater/component_updater_service.h" #include "components/google/core/browser/google_util.h" @@ -125,7 +126,6 @@ #include "extensions/browser/extension_protocols.h" #include "grit/app_locale_settings.h" #include "grit/browser_resources.h" -#include "grit/generated_resources.h" #include "grit/platform_locale_settings.h" #include "net/base/net_module.h" #include "net/base/sdch_manager.h" diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc index 71bf8137..fb517ee 100644 --- a/chrome/browser/chrome_browser_main_win.cc +++ b/chrome/browser/chrome_browser_main_win.cc @@ -39,6 +39,8 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/env_vars.h" #include "chrome/common/terminate_on_heap_corruption_experiment_win.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/helper.h" #include "chrome/installer/util/install_util.h" @@ -47,8 +49,6 @@ #include "content/public/browser/browser_thread.h" #include "content/public/common/main_function_params.h" #include "grit/app_locale_settings.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "installer_util_strings/installer_util_strings.h" #include "ui/base/cursor/cursor_loader_win.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc index 4e2913e..48dd95b 100644 --- a/chrome/browser/chrome_content_browser_client.cc +++ b/chrome/browser/chrome_content_browser_client.cc @@ -89,6 +89,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "chrome/installer/util/google_update_settings.h" #include "chromeos/chromeos_constants.h" #include "components/cdm/browser/cdm_message_filter_android.h" @@ -126,7 +127,6 @@ #include "extensions/common/permissions/permissions_data.h" #include "extensions/common/permissions/socket_permission.h" #include "extensions/common/switches.h" -#include "grit/generated_resources.h" #include "net/base/mime_util.h" #include "net/cookies/canonical_cookie.h" #include "net/cookies/cookie_options.h" diff --git a/chrome/browser/chrome_quota_permission_context.cc b/chrome/browser/chrome_quota_permission_context.cc index 2dbe930..d3bdd7f 100644 --- a/chrome/browser/chrome_quota_permission_context.cc +++ b/chrome/browser/chrome_quota_permission_context.cc @@ -15,12 +15,12 @@ #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" #include "chrome/browser/ui/website_settings/permission_bubble_request.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.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/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" diff --git a/chrome/browser/content_settings/permission_bubble_request_impl.cc b/chrome/browser/content_settings/permission_bubble_request_impl.cc index 2138830..e37f0a7 100644 --- a/chrome/browser/content_settings/permission_bubble_request_impl.cc +++ b/chrome/browser/content_settings/permission_bubble_request_impl.cc @@ -6,7 +6,7 @@ #include "chrome/browser/content_settings/permission_context_base.h" #include "chrome/browser/content_settings/permission_context_uma_util.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/content_settings/permission_infobar_delegate.cc b/chrome/browser/content_settings/permission_infobar_delegate.cc index 8d23b7d..7f41598 100644 --- a/chrome/browser/content_settings/permission_infobar_delegate.cc +++ b/chrome/browser/content_settings/permission_infobar_delegate.cc @@ -6,8 +6,8 @@ #include "chrome/browser/content_settings/permission_context_uma_util.h" #include "chrome/browser/content_settings/permission_queue_controller.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" PermissionInfobarDelegate::~PermissionInfobarDelegate() { diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.cc b/chrome/browser/custom_handlers/protocol_handler_registry.cc index 74188c62..7302ce5 100644 --- a/chrome/browser/custom_handlers/protocol_handler_registry.cc +++ b/chrome/browser/custom_handlers/protocol_handler_registry.cc @@ -15,10 +15,10 @@ #include "chrome/browser/profiles/profile_io_data.h" #include "chrome/common/custom_handlers/protocol_handler.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/child_process_security_policy.h" -#include "grit/generated_resources.h" #include "net/base/network_delegate.h" #include "net/url_request/url_request_redirect_job.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc index 669a783..53be6e1 100644 --- a/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc +++ b/chrome/browser/custom_handlers/register_protocol_handler_infobar_delegate.cc @@ -8,10 +8,10 @@ #include "chrome/browser/custom_handlers/protocol_handler_registry.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" // static diff --git a/chrome/browser/custom_handlers/register_protocol_handler_permission_request.cc b/chrome/browser/custom_handlers/register_protocol_handler_permission_request.cc index e12b0a2..6b06d6c 100644 --- a/chrome/browser/custom_handlers/register_protocol_handler_permission_request.cc +++ b/chrome/browser/custom_handlers/register_protocol_handler_permission_request.cc @@ -6,8 +6,8 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/custom_handlers/protocol_handler_registry.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/user_metrics.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc index 9335fe4..e998efd 100644 --- a/chrome/browser/custom_home_pages_table_model.cc +++ b/chrome/browser/custom_home_pages_table_model.cc @@ -18,8 +18,8 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" diff --git a/chrome/browser/devtools/devtools_file_helper.cc b/chrome/browser/devtools/devtools_file_helper.cc index d1fee7b..e480e52 100644 --- a/chrome/browser/devtools/devtools_file_helper.cc +++ b/chrome/browser/devtools/devtools_file_helper.cc @@ -22,6 +22,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" @@ -31,7 +32,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/content_client.h" #include "content/public/common/url_constants.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/shell_dialogs/select_file_dialog.h" #include "webkit/browser/fileapi/file_system_url.h" diff --git a/chrome/browser/devtools/devtools_ui_bindings.cc b/chrome/browser/devtools/devtools_ui_bindings.cc index 4588f4a..f1f9f93 100644 --- a/chrome/browser/devtools/devtools_ui_bindings.cc +++ b/chrome/browser/devtools/devtools_ui_bindings.cc @@ -30,6 +30,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/favicon_status.h" @@ -48,7 +49,6 @@ #include "extensions/browser/extension_system.h" #include "extensions/common/extension_set.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using base::DictionaryValue; diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc index 1e19c1a..11250ef 100644 --- a/chrome/browser/download/download_browsertest.cc +++ b/chrome/browser/download/download_browsertest.cc @@ -63,6 +63,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/safe_browsing/csd.pb.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" @@ -89,7 +90,6 @@ #include "content/test/net/url_request_slow_download_job.h" #include "extensions/browser/extension_system.h" #include "extensions/common/feature_switch.h" -#include "grit/generated_resources.h" #include "net/base/filename_util.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/download/download_danger_prompt.cc b/chrome/browser/download/download_danger_prompt.cc index 13d623b..c0f086a 100644 --- a/chrome/browser/download/download_danger_prompt.cc +++ b/chrome/browser/download/download_danger_prompt.cc @@ -12,10 +12,10 @@ #include "chrome/browser/extensions/api/experience_sampling_private/experience_sampling.h" #include "chrome/browser/ui/tab_modal_confirm_dialog.h" #include "chrome/browser/ui/tab_modal_confirm_dialog_delegate.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/download_danger_type.h" #include "content/public/browser/download_item.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using extensions::ExperienceSamplingEvent; diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc index 7536a2a..47793eb 100644 --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc @@ -20,11 +20,11 @@ #include "chrome/browser/download/download_stats.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/safe_browsing/download_feedback_service.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/download_danger_type.h" #include "content/public/browser/download_interrupt_reasons.h" #include "content/public/browser/download_item.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/time_format.h" #include "ui/base/text/bytes_formatting.h" diff --git a/chrome/browser/download/download_permission_request.cc b/chrome/browser/download/download_permission_request.cc index 18e1995..c8ac3db 100644 --- a/chrome/browser/download/download_permission_request.cc +++ b/chrome/browser/download/download_permission_request.cc @@ -4,8 +4,8 @@ #include "chrome/browser/download/download_permission_request.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/download/download_request_infobar_delegate.cc b/chrome/browser/download/download_request_infobar_delegate.cc index ced71ad..85cf2e1 100644 --- a/chrome/browser/download/download_request_infobar_delegate.cc +++ b/chrome/browser/download/download_request_infobar_delegate.cc @@ -5,8 +5,8 @@ #include "chrome/browser/download/download_request_infobar_delegate.h" #include "chrome/browser/infobars/infobar_service.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/download/download_shelf_context_menu.cc b/chrome/browser/download/download_shelf_context_menu.cc index 55704c9..7e39b8b 100644 --- a/chrome/browser/download/download_shelf_context_menu.cc +++ b/chrome/browser/download/download_shelf_context_menu.cc @@ -13,12 +13,12 @@ #include "chrome/browser/safe_browsing/download_protection_service.h" #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/page_navigator.h" #include "content/public/common/content_switches.h" #include "extensions/common/extension.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_WIN) diff --git a/chrome/browser/download/download_target_determiner.cc b/chrome/browser/download/download_target_determiner.cc index b4f5193..836d4ce 100644 --- a/chrome/browser/download/download_target_determiner.cc +++ b/chrome/browser/download/download_target_determiner.cc @@ -16,11 +16,11 @@ #include "chrome/browser/history/history_service_factory.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_interrupt_reasons.h" #include "extensions/common/constants.h" -#include "grit/generated_resources.h" #include "net/base/filename_util.h" #include "net/base/mime_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/download/save_package_file_picker.cc b/chrome/browser/download/save_package_file_picker.cc index f45440c..df38dbc 100644 --- a/chrome/browser/download/save_package_file_picker.cc +++ b/chrome/browser/download/save_package_file_picker.cc @@ -18,11 +18,11 @@ #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/save_page_type.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index 69d3cf9..563f464 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -27,9 +27,9 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/net/service_providers_win.h" #include "chrome/common/chrome_constants.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/notification_service.h" #include "crypto/sha2.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using content::BrowserThread; diff --git a/chrome/browser/errorpage_browsertest.cc b/chrome/browser/errorpage_browsertest.cc index d61ae8a..cb1a181 100644 --- a/chrome/browser/errorpage_browsertest.cc +++ b/chrome/browser/errorpage_browsertest.cc @@ -24,6 +24,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "components/google/core/browser/google_util.h" @@ -38,7 +39,6 @@ #include "content/public/test/test_navigation_observer.h" #include "content/test/net/url_request_failed_job.h" #include "content/test/net/url_request_mock_http_job.h" -#include "grit/generated_resources.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/http/failing_http_transaction_factory.h" diff --git a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc index f19a821..c714837 100644 --- a/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc +++ b/chrome/browser/extensions/api/bookmark_manager_private/bookmark_manager_private_api.cc @@ -24,6 +24,7 @@ #include "chrome/browser/undo/bookmark_undo_service_factory.h" #include "chrome/common/extensions/api/bookmark_manager_private.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_node_data.h" #include "components/bookmarks/browser/bookmark_utils.h" @@ -34,7 +35,6 @@ #include "content/public/browser/web_ui.h" #include "extensions/browser/extension_function_dispatcher.h" #include "extensions/browser/view_type_utils.h" -#include "grit/generated_resources.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/web_ui_util.h" diff --git a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc index 32e1342..1654dd7 100644 --- a/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc +++ b/chrome/browser/extensions/api/bookmarks/bookmarks_api.cc @@ -38,6 +38,7 @@ #include "chrome/common/extensions/api/bookmarks.h" #include "chrome/common/importer/importer_data_types.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/user_prefs/user_prefs.h" @@ -49,7 +50,6 @@ #include "extensions/browser/extension_registry.h" #include "extensions/browser/notification_types.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_WIN) diff --git a/chrome/browser/extensions/api/debugger/debugger_api.cc b/chrome/browser/extensions/api/debugger/debugger_api.cc index 1bacc59..8b2b40c 100644 --- a/chrome/browser/extensions/api/debugger/debugger_api.cc +++ b/chrome/browser/extensions/api/debugger/debugger_api.cc @@ -28,6 +28,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/webui/chrome_web_ui_controller_factory.h" #include "chrome/common/chrome_switches.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/devtools_agent_host.h" @@ -51,7 +52,6 @@ #include "extensions/common/manifest_constants.h" #include "extensions/common/permissions/permissions_data.h" #include "extensions/common/switches.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using content::DevToolsAgentHost; diff --git a/chrome/browser/extensions/api/developer_private/developer_private_api.cc b/chrome/browser/extensions/api/developer_private/developer_private_api.cc index e42018d..ff6e003 100644 --- a/chrome/browser/extensions/api/developer_private/developer_private_api.cc +++ b/chrome/browser/extensions/api/developer_private/developer_private_api.cc @@ -40,6 +40,7 @@ #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_process_host.h" @@ -65,7 +66,6 @@ #include "extensions/common/manifest_handlers/offline_enabled_info.h" #include "extensions/common/permissions/permissions_data.h" #include "extensions/common/switches.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc index 2864688..7bfafce 100644 --- a/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc +++ b/chrome/browser/extensions/api/easy_unlock_private/easy_unlock_private_api.cc @@ -14,8 +14,8 @@ #include "chrome/browser/signin/easy_unlock_screenlock_state_handler.h" #include "chrome/browser/signin/easy_unlock_service.h" #include "chrome/common/extensions/api/easy_unlock_private.h" +#include "chrome/grit/generated_resources.h" #include "extensions/browser/browser_context_keyed_api_factory.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc index da4a9b4..fd7bcb5 100644 --- a/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc +++ b/chrome/browser/extensions/api/feedback_private/feedback_private_api.cc @@ -12,9 +12,9 @@ #include "base/values.h" #include "chrome/browser/extensions/api/feedback_private/feedback_service.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/grit/generated_resources.h" #include "components/feedback/tracing_manager.h" #include "extensions/browser/event_router.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/webui/web_ui_util.h" #include "url/url_util.h" diff --git a/chrome/browser/extensions/api/file_system/file_system_api.cc b/chrome/browser/extensions/api/file_system/file_system_api.cc index 6c8d590..1622f15 100644 --- a/chrome/browser/extensions/api/file_system/file_system_api.cc +++ b/chrome/browser/extensions/api/file_system/file_system_api.cc @@ -27,6 +27,7 @@ #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/api/file_system.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/render_process_host.h" @@ -37,7 +38,6 @@ #include "extensions/browser/granted_file_entry.h" #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/generated_resources.h" #include "net/base/mime_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/shell_dialogs/select_file_dialog.h" diff --git a/chrome/browser/extensions/api/identity_private/identity_private_api.cc b/chrome/browser/extensions/api/identity_private/identity_private_api.cc index 5b8a1d4..47e2006 100644 --- a/chrome/browser/extensions/api/identity_private/identity_private_api.cc +++ b/chrome/browser/extensions/api/identity_private/identity_private_api.cc @@ -7,7 +7,7 @@ #include <string> #include "base/values.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc index 7682d79..b72bec4 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc @@ -36,6 +36,7 @@ #include "chrome/browser/ui/chrome_select_file_policy.h" #include "chrome/common/extensions/api/media_galleries.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "components/storage_monitor/storage_info.h" #include "components/web_modal/web_contents_modal_dialog_manager.h" #include "content/public/browser/blob_handle.h" @@ -52,7 +53,6 @@ #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/media_galleries_permission.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/generated_resources.h" #include "net/base/mime_sniffer.h" #include "ui/base/l10n/l10n_util.h" #include "webkit/browser/blob/blob_data_handle.h" diff --git a/chrome/browser/extensions/api/messaging/incognito_connectability.cc b/chrome/browser/extensions/api/messaging/incognito_connectability.cc index ae1baa4..a679097 100644 --- a/chrome/browser/extensions/api/messaging/incognito_connectability.cc +++ b/chrome/browser/extensions/api/messaging/incognito_connectability.cc @@ -10,9 +10,9 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/simple_message_box.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/browser/extensions/api/web_request/web_request_api.cc b/chrome/browser/extensions/api/web_request/web_request_api.cc index 5d2ff09..188940c 100644 --- a/chrome/browser/extensions/api/web_request/web_request_api.cc +++ b/chrome/browser/extensions/api/web_request/web_request_api.cc @@ -39,6 +39,7 @@ #include "chrome/common/extensions/api/web_request.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_message_filter.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" @@ -60,7 +61,6 @@ #include "extensions/common/features/feature.h" #include "extensions/common/permissions/permissions_data.h" #include "extensions/common/url_pattern.h" -#include "grit/generated_resources.h" #include "net/base/auth.h" #include "net/base/net_errors.h" #include "net/base/upload_data_stream.h" diff --git a/chrome/browser/extensions/bundle_installer.cc b/chrome/browser/extensions/bundle_installer.cc index 9a77ff0..fcd6ada 100644 --- a/chrome/browser/extensions/bundle_installer.cc +++ b/chrome/browser/extensions/bundle_installer.cc @@ -19,11 +19,11 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_switches.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc index 6af2018..b45137d 100644 --- a/chrome/browser/extensions/component_loader.cc +++ b/chrome/browser/extensions/component_loader.cc @@ -17,6 +17,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/extensions/extension_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/crx_file/id_util.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" @@ -25,7 +26,6 @@ #include "extensions/common/file_util.h" #include "extensions/common/manifest_constants.h" #include "grit/browser_resources.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" @@ -49,7 +49,7 @@ #endif #if defined(ENABLE_APP_LIST) -#include "grit/chromium_strings.h" +#include "chrome/grit/chromium_strings.h" #endif using content::BrowserThread; diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index 9823d4e..5dd139e 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -37,6 +37,8 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_url_handler.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/resource_dispatcher_host.h" @@ -55,9 +57,7 @@ #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" #include "extensions/common/user_script.h" -#include "grit/chromium_strings.h" #include "grit/extensions_strings.h" -#include "grit/generated_resources.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/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc index ba74ea9..3bef3d6 100644 --- a/chrome/browser/extensions/crx_installer_browsertest.cc +++ b/chrome/browser/extensions/crx_installer_browsertest.cc @@ -17,6 +17,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "chrome/grit/generated_resources.h" #include "chrome/test/base/ui_test_utils.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_manager.h" @@ -32,7 +33,6 @@ #include "extensions/common/file_util.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/switches.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/extensions/dev_mode_bubble_controller.cc b/chrome/browser/extensions/dev_mode_bubble_controller.cc index 254015f..bd2250a 100644 --- a/chrome/browser/extensions/dev_mode_bubble_controller.cc +++ b/chrome/browser/extensions/dev_mode_bubble_controller.cc @@ -14,10 +14,10 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_system.h" #include "extensions/common/feature_switch.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_context_menu_model.cc b/chrome/browser/extensions/extension_context_menu_model.cc index 5008e89..022e935 100644 --- a/chrome/browser/extensions/extension_context_menu_model.cc +++ b/chrome/browser/extensions/extension_context_menu_model.cc @@ -25,6 +25,8 @@ #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/web_contents.h" #include "content/public/common/context_menu_params.h" #include "extensions/browser/extension_prefs.h" @@ -34,8 +36,6 @@ #include "extensions/browser/uninstall_reason.h" #include "extensions/common/extension.h" #include "extensions/common/feature_switch.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using content::OpenURLParams; diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index 631dd53..5c65852 100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc @@ -14,13 +14,13 @@ #include "base/files/scoped_temp_dir.h" #include "base/strings/string_util.h" #include "chrome/browser/extensions/extension_creator_filter.h" +#include "chrome/grit/generated_resources.h" #include "components/crx_file/crx_file.h" #include "components/crx_file/id_util.h" #include "crypto/rsa_private_key.h" #include "crypto/signature_creator.h" #include "extensions/common/extension.h" #include "extensions/common/file_util.h" -#include "grit/generated_resources.h" #include "third_party/zlib/google/zip.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/extension_disabled_ui.cc b/chrome/browser/extensions/extension_disabled_ui.cc index c1ce05b..c6e87f4 100644 --- a/chrome/browser/extensions/extension_disabled_ui.cc +++ b/chrome/browser/extensions/extension_disabled_ui.cc @@ -28,6 +28,8 @@ #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -43,8 +45,6 @@ #include "extensions/common/permissions/permission_message_provider.h" #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/extensions/extension_error_ui.cc b/chrome/browser/extensions/extension_error_ui.cc index ea6cd16..ca170d8 100644 --- a/chrome/browser/extensions/extension_error_ui.cc +++ b/chrome/browser/extensions/extension_error_ui.cc @@ -8,9 +8,9 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/global_error/global_error.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_install_prompt.cc b/chrome/browser/extensions/extension_install_prompt.cc index 82678d9..82745c9 100644 --- a/chrome/browser/extensions/extension_install_prompt.cc +++ b/chrome/browser/extensions/extension_install_prompt.cc @@ -21,6 +21,8 @@ #include "chrome/browser/ui/browser_window.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/web_contents.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_util.h" @@ -37,8 +39,6 @@ #include "extensions/common/permissions/permission_set.h" #include "extensions/common/permissions/permissions_data.h" #include "extensions/common/url_pattern.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.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/extensions/extension_install_prompt_experiment.cc b/chrome/browser/extensions/extension_install_prompt_experiment.cc index 475cae1..499435a 100644 --- a/chrome/browser/extensions/extension_install_prompt_experiment.cc +++ b/chrome/browser/extensions/extension_install_prompt_experiment.cc @@ -9,7 +9,7 @@ #include "base/strings/string_split.h" #include "base/strings/stringprintf.h" #include "chrome/browser/extensions/extension_install_prompt_experiment.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/extensions/extension_storage_monitor.cc b/chrome/browser/extensions/extension_storage_monitor.cc index acae9b3..0574dd0 100644 --- a/chrome/browser/extensions/extension_storage_monitor.cc +++ b/chrome/browser/extensions/extension_storage_monitor.cc @@ -15,6 +15,7 @@ #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" @@ -28,7 +29,6 @@ #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/icons_handler.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/message_center/message_center.h" #include "ui/message_center/notifier_settings.h" diff --git a/chrome/browser/extensions/extension_uninstall_dialog.cc b/chrome/browser/extensions/extension_uninstall_dialog.cc index 16bfe22..735f953 100644 --- a/chrome/browser/extensions/extension_uninstall_dialog.cc +++ b/chrome/browser/extensions/extension_uninstall_dialog.cc @@ -10,6 +10,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_util.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/grit/generated_resources.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/image_loader.h" #include "extensions/common/constants.h" @@ -17,7 +18,6 @@ #include "extensions/common/extension_icon_set.h" #include "extensions/common/extension_resource.h" #include "extensions/common/manifest_handlers/icons_handler.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/extensions/extension_warning_badge_service.cc b/chrome/browser/extensions/extension_warning_badge_service.cc index 557d23e..7aa6bbc 100644 --- a/chrome/browser/extensions/extension_warning_badge_service.cc +++ b/chrome/browser/extensions/extension_warning_badge_service.cc @@ -11,8 +11,8 @@ #include "chrome/browser/ui/global_error/global_error.h" #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" +#include "chrome/grit/generated_resources.h" #include "extensions/browser/extension_system.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/browser/extensions/extension_warning_set.cc b/chrome/browser/extensions/extension_warning_set.cc index aa2abef..a7bf671 100644 --- a/chrome/browser/extensions/extension_warning_set.cc +++ b/chrome/browser/extensions/extension_warning_set.cc @@ -8,11 +8,11 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/chrome_notification_types.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/extensions/external_install_error.cc b/chrome/browser/extensions/external_install_error.cc index b3d6edd..0ed176c 100644 --- a/chrome/browser/extensions/external_install_error.cc +++ b/chrome/browser/extensions/external_install_error.cc @@ -17,12 +17,12 @@ #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "chrome/grit/generated_resources.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" #include "extensions/browser/uninstall_reason.h" #include "extensions/common/constants.h" #include "extensions/common/extension.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia_operations.h" diff --git a/chrome/browser/extensions/install_verifier.cc b/chrome/browser/extensions/install_verifier.cc index 1116990..ebd3a8d 100644 --- a/chrome/browser/extensions/install_verifier.cc +++ b/chrome/browser/extensions/install_verifier.cc @@ -18,6 +18,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_context.h" #include "content/public/common/content_switches.h" #include "extensions/browser/extension_prefs.h" @@ -27,7 +28,6 @@ #include "extensions/common/extension_set.h" #include "extensions/common/manifest.h" #include "extensions/common/one_shot_event.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/browser/extensions/ntp_overridden_bubble_controller.cc b/chrome/browser/extensions/ntp_overridden_bubble_controller.cc index 6abec00..60cc113 100644 --- a/chrome/browser/extensions/ntp_overridden_bubble_controller.cc +++ b/chrome/browser/extensions/ntp_overridden_bubble_controller.cc @@ -8,10 +8,10 @@ #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using extensions::ExtensionMessageBubbleController; diff --git a/chrome/browser/extensions/pack_extension_job.cc b/chrome/browser/extensions/pack_extension_job.cc index 55e6c81..fe1bbe0 100644 --- a/chrome/browser/extensions/pack_extension_job.cc +++ b/chrome/browser/extensions/pack_extension_job.cc @@ -9,8 +9,8 @@ #include "base/strings/sys_string_conversions.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/extensions/extension_creator.h" +#include "chrome/grit/generated_resources.h" #include "extensions/common/constants.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using content::BrowserThread; diff --git a/chrome/browser/extensions/proxy_overridden_bubble_controller.cc b/chrome/browser/extensions/proxy_overridden_bubble_controller.cc index e8ce9ae..7a656b1 100644 --- a/chrome/browser/extensions/proxy_overridden_bubble_controller.cc +++ b/chrome/browser/extensions/proxy_overridden_bubble_controller.cc @@ -10,9 +10,9 @@ #include "chrome/browser/extensions/settings_api_helpers.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/browser/extensions/requirements_checker.cc b/chrome/browser/extensions/requirements_checker.cc index 5bc3da5..23a3e77 100644 --- a/chrome/browser/extensions/requirements_checker.cc +++ b/chrome/browser/extensions/requirements_checker.cc @@ -6,12 +6,12 @@ #include "base/bind.h" #include "chrome/browser/gpu/gpu_feature_checker.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "extensions/common/extension.h" #include "extensions/common/manifest.h" #include "extensions/common/manifest_handlers/requirements_info.h" #include "gpu/config/gpu_feature_type.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_WIN) diff --git a/chrome/browser/extensions/requirements_checker_browsertest.cc b/chrome/browser/extensions/requirements_checker_browsertest.cc index 7f3b150..09e9d44 100644 --- a/chrome/browser/extensions/requirements_checker_browsertest.cc +++ b/chrome/browser/extensions/requirements_checker_browsertest.cc @@ -13,12 +13,12 @@ #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/requirements_checker.h" #include "chrome/common/chrome_paths.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/gpu_data_manager.h" #include "extensions/common/extension.h" #include "extensions/common/file_util.h" #include "gpu/config/gpu_info.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/browser/extensions/sandboxed_unpacker.cc b/chrome/browser/extensions/sandboxed_unpacker.cc index 05fef3b..56e5118 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_unpacker.cc @@ -26,6 +26,7 @@ #include "chrome/common/chrome_utility_messages.h" #include "chrome/common/extensions/chrome_utility_extensions_messages.h" #include "chrome/common/extensions/extension_file_util.h" +#include "chrome/grit/generated_resources.h" #include "components/crx_file/constants.h" #include "components/crx_file/crx_file.h" #include "components/crx_file/id_util.h" @@ -39,7 +40,6 @@ #include "extensions/common/file_util.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/manifest_handlers/icons_handler.h" -#include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/codec/png_codec.h" diff --git a/chrome/browser/extensions/settings_api_bubble_controller.cc b/chrome/browser/extensions/settings_api_bubble_controller.cc index f5721fe..d091916 100644 --- a/chrome/browser/extensions/settings_api_bubble_controller.cc +++ b/chrome/browser/extensions/settings_api_bubble_controller.cc @@ -12,11 +12,11 @@ #include "chrome/browser/ui/startup/startup_browser_creator.h" #include "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_system.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace extensions { diff --git a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc index c0a48d1..8e37045 100644 --- a/chrome/browser/extensions/suspicious_extension_bubble_controller.cc +++ b/chrome/browser/extensions/suspicious_extension_bubble_controller.cc @@ -12,11 +12,11 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "extensions/browser/extension_prefs.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using extensions::ExtensionMessageBubbleController; diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc index 398dae3..2536f53 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc @@ -15,11 +15,11 @@ #include "chrome/browser/themes/theme_service_factory.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/tabs/tab_strip_model.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/notification_source.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc index ec67dd8..00e3046 100644 --- a/chrome/browser/file_select_helper.cc +++ b/chrome/browser/file_select_helper.cc @@ -18,6 +18,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/chrome_select_file_policy.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" @@ -26,7 +27,6 @@ #include "content/public/browser/render_widget_host_view.h" #include "content/public/browser/web_contents.h" #include "content/public/common/file_chooser_params.h" -#include "grit/generated_resources.h" #include "net/base/mime_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/shell_dialogs/selected_file_info.h" diff --git a/chrome/browser/first_run/try_chrome_dialog_view.cc b/chrome/browser/first_run/try_chrome_dialog_view.cc index ebb011f..d9d95b5 100644 --- a/chrome/browser/first_run/try_chrome_dialog_view.cc +++ b/chrome/browser/first_run/try_chrome_dialog_view.cc @@ -10,10 +10,10 @@ #include "base/message_loop/message_loop.h" #include "base/strings/string16.h" #include "chrome/browser/process_singleton.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/user_experiment.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/aura/window.h" #include "ui/aura/window_tree_host.h" diff --git a/chrome/browser/geolocation/geolocation_infobar_delegate.cc b/chrome/browser/geolocation/geolocation_infobar_delegate.cc index d692cea..1859d16 100644 --- a/chrome/browser/geolocation/geolocation_infobar_delegate.cc +++ b/chrome/browser/geolocation/geolocation_infobar_delegate.cc @@ -7,12 +7,12 @@ #include "base/metrics/histogram.h" #include "chrome/browser/content_settings/permission_queue_controller.h" #include "chrome/browser/infobars/infobar_service.h" +#include "chrome/grit/generated_resources.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/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" diff --git a/chrome/browser/geolocation/geolocation_permission_context.cc b/chrome/browser/geolocation/geolocation_permission_context.cc index 496b500..c19ae1d 100644 --- a/chrome/browser/geolocation/geolocation_permission_context.cc +++ b/chrome/browser/geolocation/geolocation_permission_context.cc @@ -19,11 +19,11 @@ #include "chrome/browser/ui/website_settings/permission_bubble_manager.h" #include "chrome/browser/ui/website_settings/permission_bubble_request.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/google/google_update_win.cc b/chrome/browser/google/google_update_win.cc index 5058618..0b217ad 100644 --- a/chrome/browser/google/google_update_win.cc +++ b/chrome/browser/google/google_update_win.cc @@ -16,13 +16,13 @@ #include "base/threading/thread.h" #include "base/win/scoped_comptr.h" #include "base/win/windows_version.h" +#include "chrome/grit/generated_resources.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome/installer/util/helper.h" #include "chrome/installer/util/install_util.h" #include "content/public/browser/browser_thread.h" #include "google_update/google_update_idl.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/win/atl_module.h" #include "ui/views/widget/widget.h" diff --git a/chrome/browser/gpu/three_d_api_observer.cc b/chrome/browser/gpu/three_d_api_observer.cc index 4042257..4887cfb 100644 --- a/chrome/browser/gpu/three_d_api_observer.cc +++ b/chrome/browser/gpu/three_d_api_observer.cc @@ -7,10 +7,10 @@ #include "base/metrics/histogram.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/tab_contents/tab_util.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/gpu_data_manager.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/hang_monitor/hung_plugin_action.cc b/chrome/browser/hang_monitor/hung_plugin_action.cc index 2aa2b4c..25659bf 100644 --- a/chrome/browser/hang_monitor/hung_plugin_action.cc +++ b/chrome/browser/hang_monitor/hung_plugin_action.cc @@ -10,9 +10,9 @@ #include "base/version.h" #include "chrome/browser/ui/simple_message_box.h" #include "chrome/common/logging_chrome.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/plugin_service.h" #include "content/public/common/webplugininfo.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/win/hwnd_util.h" diff --git a/chrome/browser/history/chrome_history_client.cc b/chrome/browser/history/chrome_history_client.cc index 8f359ab..de8da22 100644 --- a/chrome/browser/history/chrome_history_client.cc +++ b/chrome/browser/history/chrome_history_client.cc @@ -7,9 +7,9 @@ #include "base/logging.h" #include "chrome/browser/ui/profile_error_dialog.h" #include "chrome/common/chrome_version_info.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "components/bookmarks/browser/bookmark_model.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" ChromeHistoryClient::ChromeHistoryClient(BookmarkModel* bookmark_model) : bookmark_model_(bookmark_model) { diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc index 816f09c..8e18051 100644 --- a/chrome/browser/history/top_sites.cc +++ b/chrome/browser/history/top_sites.cc @@ -6,8 +6,8 @@ #include "base/strings/string_util.h" #include "chrome/browser/history/top_sites_impl.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/importer/external_process_importer_client.cc b/chrome/browser/importer/external_process_importer_client.cc index 254132f..4394611 100644 --- a/chrome/browser/importer/external_process_importer_client.cc +++ b/chrome/browser/importer/external_process_importer_client.cc @@ -12,10 +12,10 @@ #include "chrome/common/importer/firefox_importer_utils.h" #include "chrome/common/importer/imported_bookmark_entry.h" #include "chrome/common/importer/profile_import_process_messages.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/utility_process_host.h" #include "grit/components_strings.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using content::BrowserThread; diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc index f673949..d42ef4e 100644 --- a/chrome/browser/importer/importer_list.cc +++ b/chrome/browser/importer/importer_list.cc @@ -9,8 +9,8 @@ #include "chrome/common/importer/firefox_importer_utils.h" #include "chrome/common/importer/importer_bridge.h" #include "chrome/common/importer/importer_data_types.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/infobars/insecure_content_infobar_delegate.cc b/chrome/browser/infobars/insecure_content_infobar_delegate.cc index b427c0c..10a0c50 100644 --- a/chrome/browser/infobars/insecure_content_infobar_delegate.cc +++ b/chrome/browser/infobars/insecure_content_infobar_delegate.cc @@ -7,13 +7,13 @@ #include "base/metrics/histogram.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/common/render_messages.h" +#include "chrome/grit/generated_resources.h" #include "components/google/core/browser/google_util.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "content/public/common/page_transition_types.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index 2c65ce1..6d10a44 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -25,11 +25,11 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/favicon_base/favicon_types.h" #include "components/history/core/browser/page_usage_data.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_source.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/favicon_size.h" diff --git a/chrome/browser/local_discovery/privet_notifications.cc b/chrome/browser/local_discovery/privet_notifications.cc index 705ccde..f285de6 100644 --- a/chrome/browser/local_discovery/privet_notifications.cc +++ b/chrome/browser/local_discovery/privet_notifications.cc @@ -27,12 +27,12 @@ #include "chrome/browser/ui/webui/local_discovery/local_discovery_ui_handler.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "components/signin/core/browser/signin_manager_base.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" #include "content/public/common/page_transition_types.h" -#include "grit/generated_resources.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/mac/install_from_dmg.mm b/chrome/browser/mac/install_from_dmg.mm index dfe2a36..7f85592 100644 --- a/chrome/browser/mac/install_from_dmg.mm +++ b/chrome/browser/mac/install_from_dmg.mm @@ -13,8 +13,8 @@ #include <signal.h> #include <stdlib.h> #include <string.h> -#include <sys/param.h> #include <sys/mount.h> +#include <sys/param.h> #include "base/auto_reset.h" #include "base/basictypes.h" @@ -24,8 +24,8 @@ #include "base/mac/authorization_util.h" #include "base/mac/bundle_locations.h" #include "base/mac/mac_logging.h" -#include "base/mac/mach_logging.h" #import "base/mac/mac_util.h" +#include "base/mac/mach_logging.h" #include "base/mac/scoped_authorizationref.h" #include "base/mac/scoped_cftyperef.h" #include "base/mac/scoped_ioobject.h" @@ -36,8 +36,8 @@ #import "chrome/browser/mac/keystone_glue.h" #include "chrome/browser/mac/relauncher.h" #include "chrome/common/chrome_constants.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" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/mac/keystone_glue.mm b/chrome/browser/mac/keystone_glue.mm index 959eac2..6960e70 100644 --- a/chrome/browser/mac/keystone_glue.mm +++ b/chrome/browser/mac/keystone_glue.mm @@ -27,8 +27,8 @@ #include "chrome/browser/mac/obsolete_system.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_version_info.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" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/mac/obsolete_system.cc b/chrome/browser/mac/obsolete_system.cc index 844d753..32473b2 100644 --- a/chrome/browser/mac/obsolete_system.cc +++ b/chrome/browser/mac/obsolete_system.cc @@ -7,7 +7,7 @@ #include <sys/sysctl.h> #include <sys/types.h> -#include "grit/chromium_strings.h" +#include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" #if !defined(ARCH_CPU_64_BITS) diff --git a/chrome/browser/media/desktop_media_list_ash.cc b/chrome/browser/media/desktop_media_list_ash.cc index 366ffa7..d24ec21 100644 --- a/chrome/browser/media/desktop_media_list_ash.cc +++ b/chrome/browser/media/desktop_media_list_ash.cc @@ -13,8 +13,8 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/media/desktop_media_list_observer.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" -#include "grit/generated_resources.h" #include "media/base/video_util.h" #include "ui/base/l10n/l10n_util.h" #include "ui/compositor/dip_util.h" diff --git a/chrome/browser/media/media_capture_devices_dispatcher.cc b/chrome/browser/media/media_capture_devices_dispatcher.cc index 42d8eb00..aa4020d 100644 --- a/chrome/browser/media/media_capture_devices_dispatcher.cc +++ b/chrome/browser/media/media_capture_devices_dispatcher.cc @@ -28,6 +28,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/desktop_media_id.h" @@ -42,7 +43,6 @@ #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/generated_resources.h" #include "media/audio/audio_manager_base.h" #include "media/base/media_switches.h" #include "net/base/net_util.h" diff --git a/chrome/browser/media/media_stream_capture_indicator.cc b/chrome/browser/media/media_stream_capture_indicator.cc index df31086..f6b5806 100644 --- a/chrome/browser/media/media_stream_capture_indicator.cc +++ b/chrome/browser/media/media_stream_capture_indicator.cc @@ -17,13 +17,13 @@ #include "chrome/browser/status_icons/status_tray.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/chromium_strings.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "content/public/browser/invalidate_type.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/browser/web_contents_observer.h" -#include "grit/chromium_strings.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/media/media_stream_devices_controller.cc b/chrome/browser/media/media_stream_devices_controller.cc index dd9ca2c..cb402eb 100644 --- a/chrome/browser/media/media_stream_devices_controller.cc +++ b/chrome/browser/media/media_stream_devices_controller.cc @@ -21,12 +21,12 @@ #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_pattern.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_widget_host_view.h" #include "content/public/common/media_stream_request.h" #include "extensions/common/constants.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/media/media_stream_infobar_delegate.cc b/chrome/browser/media/media_stream_infobar_delegate.cc index 4a263bb..5c63c43 100644 --- a/chrome/browser/media/media_stream_infobar_delegate.cc +++ b/chrome/browser/media/media_stream_infobar_delegate.cc @@ -9,10 +9,10 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/google/core/browser/google_util.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" diff --git a/chrome/browser/media/midi_permission_infobar_delegate.cc b/chrome/browser/media/midi_permission_infobar_delegate.cc index f8b74a2..c8a0882 100644 --- a/chrome/browser/media/midi_permission_infobar_delegate.cc +++ b/chrome/browser/media/midi_permission_infobar_delegate.cc @@ -7,10 +7,10 @@ #include "chrome/browser/content_settings/permission_queue_controller.h" #include "chrome/browser/content_settings/permission_request_id.h" #include "chrome/browser/infobars/infobar_service.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" diff --git a/chrome/browser/media/native_desktop_media_list.cc b/chrome/browser/media/native_desktop_media_list.cc index ad3cbce..6b5eeaa 100644 --- a/chrome/browser/media/native_desktop_media_list.cc +++ b/chrome/browser/media/native_desktop_media_list.cc @@ -13,8 +13,8 @@ #include "base/strings/utf_string_conversions.h" #include "base/threading/sequenced_worker_pool.h" #include "chrome/browser/media/desktop_media_list_observer.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" -#include "grit/generated_resources.h" #include "media/base/video_util.h" #include "third_party/libyuv/include/libyuv/scale_argb.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/media/protected_media_identifier_infobar_delegate.cc b/chrome/browser/media/protected_media_identifier_infobar_delegate.cc index a968131..b3b6db3 100644 --- a/chrome/browser/media/protected_media_identifier_infobar_delegate.cc +++ b/chrome/browser/media/protected_media_identifier_infobar_delegate.cc @@ -6,9 +6,9 @@ #include "chrome/browser/content_settings/permission_queue_controller.h" #include "chrome/browser/infobars/infobar_service.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/navigation_entry.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/media_galleries/media_galleries_permission_controller.cc b/chrome/browser/media_galleries/media_galleries_permission_controller.cc index 9ad8cba..130049a 100644 --- a/chrome/browser/media_galleries/media_galleries_permission_controller.cc +++ b/chrome/browser/media_galleries/media_galleries_permission_controller.cc @@ -15,6 +15,7 @@ #include "chrome/browser/media_galleries/media_gallery_context_menu.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/chrome_select_file_policy.h" +#include "chrome/grit/generated_resources.h" #include "components/storage_monitor/storage_info.h" #include "components/storage_monitor/storage_monitor.h" #include "content/public/browser/web_contents.h" @@ -22,7 +23,6 @@ #include "extensions/common/extension.h" #include "extensions/common/permissions/media_galleries_permission.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/text/bytes_formatting.h" diff --git a/chrome/browser/media_galleries/media_galleries_preferences.cc b/chrome/browser/media_galleries/media_galleries_preferences.cc index 8b48c51..ed5b223 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences.cc @@ -26,6 +26,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "components/crx_file/id_util.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/storage_monitor/media_storage_util.h" @@ -38,7 +39,6 @@ #include "extensions/common/permissions/api_permission.h" #include "extensions/common/permissions/media_galleries_permission.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using base::DictionaryValue; diff --git a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc index e3a4e8f..bfc5f71 100644 --- a/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc +++ b/chrome/browser/media_galleries/media_galleries_preferences_unittest.cc @@ -22,6 +22,7 @@ #include "chrome/browser/media_galleries/media_galleries_test_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "chrome/test/base/testing_profile.h" #include "components/storage_monitor/media_storage_util.h" #include "components/storage_monitor/storage_monitor.h" @@ -31,7 +32,6 @@ #include "extensions/common/extension.h" #include "extensions/common/manifest_handlers/background_info.h" #include "extensions/common/permissions/media_galleries_permission.h" -#include "grit/generated_resources.h" #include "sync/api/string_ordinal.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/media_galleries/media_galleries_scan_result_controller.cc b/chrome/browser/media_galleries/media_galleries_scan_result_controller.cc index 1fadc8c..3b39a44 100644 --- a/chrome/browser/media_galleries/media_galleries_scan_result_controller.cc +++ b/chrome/browser/media_galleries/media_galleries_scan_result_controller.cc @@ -18,13 +18,13 @@ #include "chrome/browser/media_galleries/media_gallery_context_menu.h" #include "chrome/browser/platform_util.h" #include "chrome/browser/profiles/profile.h" +#include "chrome/grit/generated_resources.h" #include "components/storage_monitor/storage_info.h" #include "components/storage_monitor/storage_monitor.h" #include "content/public/browser/web_contents.h" #include "extensions/common/extension.h" #include "extensions/common/permissions/media_galleries_permission.h" #include "extensions/common/permissions/permissions_data.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using storage_monitor::StorageInfo; diff --git a/chrome/browser/media_galleries/media_gallery_context_menu.cc b/chrome/browser/media_galleries/media_gallery_context_menu.cc index 8230910..1e637a1 100644 --- a/chrome/browser/media_galleries/media_gallery_context_menu.cc +++ b/chrome/browser/media_galleries/media_gallery_context_menu.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "chrome/browser/media_galleries/media_gallery_context_menu.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/menu_model.h" diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index 75b6b47..7d8c3c9 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -12,6 +12,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/nacl/common/nacl_process_type.h" #include "content/public/browser/browser_child_process_host_iterator.h" #include "content/public/browser/browser_thread.h" @@ -23,7 +24,6 @@ #include "content/public/browser/render_widget_host_iterator.h" #include "content/public/browser/web_contents.h" #include "content/public/common/bindings_policy.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) diff --git a/chrome/browser/memory_details_android.cc b/chrome/browser/memory_details_android.cc index 662ea9e..056e718 100644 --- a/chrome/browser/memory_details_android.cc +++ b/chrome/browser/memory_details_android.cc @@ -13,9 +13,9 @@ #include "base/process/process_iterator.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_constants.h" +#include "chrome/grit/chromium_strings.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/process_type.h" -#include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" using base::ProcessEntry; diff --git a/chrome/browser/memory_details_linux.cc b/chrome/browser/memory_details_linux.cc index e37ef55..a85eda6 100644 --- a/chrome/browser/memory_details_linux.cc +++ b/chrome/browser/memory_details_linux.cc @@ -18,9 +18,9 @@ #include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_constants.h" +#include "chrome/grit/chromium_strings.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/process_type.h" -#include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" using base::ProcessEntry; diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc index be58eef..2b1bf07 100644 --- a/chrome/browser/memory_details_mac.cc +++ b/chrome/browser/memory_details_mac.cc @@ -20,9 +20,9 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/chromium_strings.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/process_type.h" -#include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" using content::BrowserThread; diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index b3a3a44..bd68490 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc @@ -16,9 +16,9 @@ #include "base/win/windows_version.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/chromium_strings.h" #include "content/public/browser/browser_thread.h" #include "content/public/common/process_type.h" -#include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" using content::BrowserThread; diff --git a/chrome/browser/nacl_host/nacl_infobar_delegate.cc b/chrome/browser/nacl_host/nacl_infobar_delegate.cc index e488865..466f0a3 100644 --- a/chrome/browser/nacl_host/nacl_infobar_delegate.cc +++ b/chrome/browser/nacl_host/nacl_infobar_delegate.cc @@ -5,10 +5,10 @@ #include "chrome/browser/nacl_host/nacl_infobar_delegate.h" #include "chrome/browser/infobars/infobar_service.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" diff --git a/chrome/browser/notifications/desktop_notification_infobar_delegate.cc b/chrome/browser/notifications/desktop_notification_infobar_delegate.cc index b00a5c3..036211c 100644 --- a/chrome/browser/notifications/desktop_notification_infobar_delegate.cc +++ b/chrome/browser/notifications/desktop_notification_infobar_delegate.cc @@ -7,11 +7,11 @@ #include "chrome/browser/content_settings/permission_queue_controller.h" #include "chrome/browser/content_settings/permission_request_id.h" #include "chrome/browser/infobars/infobar_service.h" +#include "chrome/grit/generated_resources.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/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" diff --git a/chrome/browser/notifications/extension_welcome_notification.cc b/chrome/browser/notifications/extension_welcome_notification.cc index cbe7e79..84019ce 100644 --- a/chrome/browser/notifications/extension_welcome_notification.cc +++ b/chrome/browser/notifications/extension_welcome_notification.cc @@ -16,8 +16,8 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/pref_registry/pref_registry_syncable.h" -#include "grit/generated_resources.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/password_manager/native_backend_kwallet_x.cc b/chrome/browser/password_manager/native_backend_kwallet_x.cc index ca346cd..933c673 100644 --- a/chrome/browser/password_manager/native_backend_kwallet_x.cc +++ b/chrome/browser/password_manager/native_backend_kwallet_x.cc @@ -13,13 +13,13 @@ #include "base/strings/stringprintf.h" #include "base/synchronization/waitable_event.h" #include "base/threading/thread_restrictions.h" +#include "chrome/grit/chromium_strings.h" #include "components/autofill/core/common/password_form.h" #include "content/public/browser/browser_thread.h" #include "dbus/bus.h" #include "dbus/message.h" #include "dbus/object_path.h" #include "dbus/object_proxy.h" -#include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" using autofill::PasswordForm; diff --git a/chrome/browser/password_manager/password_manager_util_mac.mm b/chrome/browser/password_manager/password_manager_util_mac.mm index 9bbf02a..f47f116 100644 --- a/chrome/browser/password_manager/password_manager_util_mac.mm +++ b/chrome/browser/password_manager/password_manager_util_mac.mm @@ -4,15 +4,15 @@ #include "chrome/browser/password_manager/password_manager_util.h" -#import <Foundation/Foundation.h> #include <CoreFoundation/CoreFoundation.h> +#import <Foundation/Foundation.h> #include <Security/Authorization.h> #include "base/basictypes.h" #include "base/mac/authorization_util.h" #include "base/mac/foundation_util.h" #include "base/mac/scoped_authorizationref.h" -#include "grit/chromium_strings.h" +#include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" namespace password_manager_util { diff --git a/chrome/browser/password_manager/password_manager_util_win.cc b/chrome/browser/password_manager/password_manager_util_win.cc index 4920148..cf20434 100644 --- a/chrome/browser/password_manager/password_manager_util_win.cc +++ b/chrome/browser/password_manager/password_manager_util_win.cc @@ -4,8 +4,8 @@ // windows.h must be first otherwise Win8 SDK breaks. #include <windows.h> -#include <wincred.h> #include <LM.h> +#include <wincred.h> // SECURITY_WIN32 must be defined in order to get // EXTENDED_NAME_FORMAT enumeration. @@ -21,11 +21,11 @@ #include "base/time/time.h" #include "base/win/windows_version.h" #include "chrome/browser/browser_process.h" +#include "chrome/grit/chromium_strings.h" #include "components/password_manager/core/browser/password_manager.h" #include "components/password_manager/core/common/password_manager_pref_names.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" -#include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" #if defined(USE_AURA) diff --git a/chrome/browser/password_manager/save_password_infobar_delegate.cc b/chrome/browser/password_manager/save_password_infobar_delegate.cc index 9c13760..882bde0 100644 --- a/chrome/browser/password_manager/save_password_infobar_delegate.cc +++ b/chrome/browser/password_manager/save_password_infobar_delegate.cc @@ -8,14 +8,14 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/ui/sync/one_click_signin_helper.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar.h" #include "components/password_manager/core/browser/password_form_manager.h" #include "components/signin/core/common/profile_management_switches.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/web_contents.h" #include "google_apis/gaia/gaia_urls.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/pepper_broker_infobar_delegate.cc b/chrome/browser/pepper_broker_infobar_delegate.cc index 4a0bcd4..087c6d2 100644 --- a/chrome/browser/pepper_broker_infobar_delegate.cc +++ b/chrome/browser/pepper_broker_infobar_delegate.cc @@ -12,6 +12,7 @@ #include "chrome/browser/plugins/plugin_metadata.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/plugin_service.h" @@ -19,7 +20,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/referrer.h" #include "content/public/common/webplugininfo.h" -#include "grit/generated_resources.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 d9c99be..e1ef089 100644 --- a/chrome/browser/plugins/plugin_infobar_delegates.cc +++ b/chrome/browser/plugins/plugin_infobar_delegates.cc @@ -16,13 +16,13 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/ui/browser_commands.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.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/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/plugins/plugin_observer.cc b/chrome/browser/plugins/plugin_observer.cc index 9accbf8..f869457 100644 --- a/chrome/browser/plugins/plugin_observer.cc +++ b/chrome/browser/plugins/plugin_observer.cc @@ -22,6 +22,7 @@ #include "chrome/browser/ui/tab_modal_confirm_dialog.h" #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/plugin_service.h" @@ -30,7 +31,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/webplugininfo.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/policy/policy_browsertest.cc b/chrome/browser/policy/policy_browsertest.cc index c0c411f..4eaa6cd 100644 --- a/chrome/browser/policy/policy_browsertest.cc +++ b/chrome/browser/policy/policy_browsertest.cc @@ -76,6 +76,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" @@ -129,7 +130,6 @@ #include "extensions/common/constants.h" #include "extensions/common/extension.h" #include "extensions/common/extension_set.h" -#include "grit/generated_resources.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" #include "net/base/url_util.h" diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc index d3ed10d..81b2c66 100644 --- a/chrome/browser/prefs/chrome_pref_service_factory.cc +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc @@ -38,6 +38,8 @@ #include "chrome/browser/ui/profile_error_dialog.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/search_engines/default_search_manager.h" #include "components/search_engines/search_engines_pref_names.h" @@ -45,8 +47,6 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "grit/browser_resources.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "sync/internal_api/public/base/model_type.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc index 65d4bb9..f5aa347 100644 --- a/chrome/browser/prerender/prerender_browsertest.cc +++ b/chrome/browser/prerender/prerender_browsertest.cc @@ -62,6 +62,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/manifest_handlers/mime_types_handler.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/ui_test_utils.h" @@ -82,7 +83,6 @@ #include "content/public/test/test_utils.h" #include "content/test/net/url_request_mock_http_job.h" #include "extensions/common/switches.h" -#include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/cert/x509_certificate.h" #include "net/dns/mock_host_resolver.h" diff --git a/chrome/browser/printing/print_error_dialog.cc b/chrome/browser/printing/print_error_dialog.cc index 75fdd29..43abe64 100644 --- a/chrome/browser/printing/print_error_dialog.cc +++ b/chrome/browser/printing/print_error_dialog.cc @@ -7,8 +7,8 @@ #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/browser_window.h" #include "chrome/browser/ui/simple_message_box.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace chrome { diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc index e7f4d32..9ee5262 100644 --- a/chrome/browser/printing/print_job_worker.cc +++ b/chrome/browser/printing/print_job_worker.cc @@ -14,9 +14,9 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/printing/print_job.h" #include "chrome/browser/printing/printing_ui_web_contents_observer.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" -#include "grit/generated_resources.h" #include "printing/print_job_constants.h" #include "printing/printed_document.h" #include "printing/printed_page.h" diff --git a/chrome/browser/printing/print_view_manager_base.cc b/chrome/browser/printing/print_view_manager_base.cc index 4e15b1d..d4ab434 100644 --- a/chrome/browser/printing/print_view_manager_base.cc +++ b/chrome/browser/printing/print_view_manager_base.cc @@ -18,13 +18,13 @@ #include "chrome/browser/ui/simple_message_box.h" #include "chrome/common/pref_names.h" #include "chrome/common/print_messages.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "printing/metafile_impl.h" #include "printing/printed_document.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/process_singleton_posix.cc b/chrome/browser/process_singleton_posix.cc index 353b4af..b65911f 100644 --- a/chrome/browser/process_singleton_posix.cc +++ b/chrome/browser/process_singleton_posix.cc @@ -76,9 +76,9 @@ #include "base/time/time.h" #include "base/timer/timer.h" #include "chrome/common/chrome_constants.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index 9c65563..1acde3c 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc @@ -31,9 +31,9 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/common/chrome_switches.h" +#include "chrome/grit/chromium_strings.h" #include "chrome/installer/util/wmi.h" #include "content/public/common/result_codes.h" -#include "grit/chromium_strings.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/win/hwnd_util.h" diff --git a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc index 9941b94..5d2fedb 100644 --- a/chrome/browser/profile_resetter/resettable_settings_snapshot.cc +++ b/chrome/browser/profile_resetter/resettable_settings_snapshot.cc @@ -16,13 +16,13 @@ #include "chrome/common/chrome_content_client.h" #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" +#include "chrome/grit/google_chrome_strings.h" #include "components/feedback/feedback_data.h" #include "components/feedback/feedback_util.h" #include "components/search_engines/template_url_service.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/extension_registry.h" -#include "grit/generated_resources.h" -#include "grit/google_chrome_strings.h" #include "ui/base/l10n/l10n_util.h" using feedback::FeedbackData; diff --git a/chrome/browser/profiles/avatar_menu.cc b/chrome/browser/profiles/avatar_menu.cc index f9f4fc1..24f1ec4 100644 --- a/chrome/browser/profiles/avatar_menu.cc +++ b/chrome/browser/profiles/avatar_menu.cc @@ -24,10 +24,10 @@ #include "chrome/browser/ui/host_desktop.h" #include "chrome/browser/ui/startup/startup_browser_creator.h" #include "chrome/common/chrome_switches.h" +#include "chrome/grit/generated_resources.h" #include "components/signin/core/common/profile_management_switches.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" -#include "grit/generated_resources.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/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index 64fbb858..9520058 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -79,6 +79,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/chromium_strings.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/dom_distiller/content/dom_distiller_viewer_source.h" #include "components/dom_distiller/core/url_constants.h" @@ -100,7 +101,6 @@ #include "content/public/browser/user_metrics.h" #include "content/public/common/content_constants.h" #include "content/public/common/page_zoom.h" -#include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" #if defined(OS_ANDROID) diff --git a/chrome/browser/profiles/profile_info_cache.cc b/chrome/browser/profiles/profile_info_cache.cc index 8aaa047..37fbcf1 100644 --- a/chrome/browser/profiles/profile_info_cache.cc +++ b/chrome/browser/profiles/profile_info_cache.cc @@ -24,10 +24,10 @@ #include "chrome/browser/profiles/profile_avatar_icon_util.h" #include "chrome/browser/profiles/profiles_state.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "components/signin/core/common/profile_management_switches.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" -#include "grit/generated_resources.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/profiles/profile_list_desktop.cc b/chrome/browser/profiles/profile_list_desktop.cc index 8a1eff7..755794b 100644 --- a/chrome/browser/profiles/profile_list_desktop.cc +++ b/chrome/browser/profiles/profile_list_desktop.cc @@ -7,8 +7,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_avatar_icon_util.h" #include "chrome/browser/profiles/profile_info_cache.h" +#include "chrome/grit/generated_resources.h" #include "components/signin/core/common/profile_management_switches.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" ProfileListDesktop::ProfileListDesktop(ProfileInfoInterface* profile_cache) diff --git a/chrome/browser/profiles/profile_list_desktop_unittest.cc b/chrome/browser/profiles/profile_list_desktop_unittest.cc index 5d34641..fb7a9ec 100644 --- a/chrome/browser/profiles/profile_list_desktop_unittest.cc +++ b/chrome/browser/profiles/profile_list_desktop_unittest.cc @@ -15,11 +15,11 @@ #include "chrome/browser/profiles/avatar_menu_observer.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profiles_state.h" +#include "chrome/grit/generated_resources.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile_manager.h" #include "components/signin/core/common/profile_management_switches.h" #include "content/public/test/test_browser_thread_bundle.h" -#include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/profiles/profile_manager.cc b/chrome/browser/profiles/profile_manager.cc index 9d410c5..b8f76d1 100644 --- a/chrome/browser/profiles/profile_manager.cc +++ b/chrome/browser/profiles/profile_manager.cc @@ -47,6 +47,7 @@ #include "chrome/common/logging_chrome.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/password_manager/core/browser/password_store.h" #include "components/signin/core/common/profile_management_switches.h" @@ -56,7 +57,6 @@ #include "extensions/browser/extension_registry.h" #include "extensions/common/extension_set.h" #include "extensions/common/manifest.h" -#include "grit/generated_resources.h" #include "net/http/http_transaction_factory.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc index 1645dc1..d5a0001 100644 --- a/chrome/browser/profiles/profile_manager_unittest.cc +++ b/chrome/browser/profiles/profile_manager_unittest.cc @@ -31,6 +31,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "chrome/test/base/scoped_testing_local_state.h" #include "chrome/test/base/test_browser_window.h" #include "chrome/test/base/testing_browser_process.h" @@ -39,7 +40,6 @@ #include "content/public/browser/notification_service.h" #include "content/public/common/content_switches.h" #include "content/public/test/test_browser_thread_bundle.h" -#include "grit/generated_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc index e8e1275..fb5460c 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc @@ -18,6 +18,7 @@ #include "chrome/browser/profiles/profile_shortcut_manager.h" #include "chrome/browser/profiles/profile_shortcut_manager_win.h" #include "chrome/browser/shell_integration.h" +#include "chrome/grit/chromium_strings.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/product.h" #include "chrome/installer/util/shell_util.h" @@ -25,7 +26,6 @@ #include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile_manager.h" #include "content/public/test/test_browser_thread.h" -#include "grit/chromium_strings.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/profiles/profile_shortcut_manager_win.cc b/chrome/browser/profiles/profile_shortcut_manager_win.cc index 199220d..1495e13 100644 --- a/chrome/browser/profiles/profile_shortcut_manager_win.cc +++ b/chrome/browser/profiles/profile_shortcut_manager_win.cc @@ -29,13 +29,13 @@ #include "chrome/browser/shell_integration.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/chromium_strings.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/product.h" #include "chrome/installer/util/shell_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "grit/chrome_unscaled_resources.h" -#include "grit/chromium_strings.h" #include "skia/ext/image_operations.h" #include "skia/ext/platform_canvas.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/profiles/profiles_state.cc b/chrome/browser/profiles/profiles_state.cc index 58096ac..de8193d 100644 --- a/chrome/browser/profiles/profiles_state.cc +++ b/chrome/browser/profiles/profiles_state.cc @@ -18,9 +18,9 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/common/profile_management_switches.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/text_elider.h" diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc index 41e8cb1..6ea1b71 100644 --- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc +++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc @@ -60,6 +60,7 @@ #include "chrome/common/render_messages.h" #include "chrome/common/spellcheck_messages.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/google/core/browser/google_util.h" #include "components/metrics/proto/omnibox_input_type.pb.h" #include "components/omnibox/autocomplete_match.h" @@ -89,7 +90,6 @@ #include "extensions/browser/extension_system.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/extension.h" -#include "grit/generated_resources.h" #include "net/base/escape.h" #include "third_party/WebKit/public/web/WebContextMenuData.h" #include "third_party/WebKit/public/web/WebMediaPlayerAction.h" diff --git a/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc b/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc index 596c3c9..110dd30 100644 --- a/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc +++ b/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_hunspell.cc @@ -15,10 +15,10 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/spellcheck_messages.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" #include "extensions/browser/view_type_utils.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" diff --git a/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_mac.cc b/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_mac.cc index a81e565..f8ac7ef 100644 --- a/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_mac.cc +++ b/chrome/browser/renderer_context_menu/spellchecker_submenu_observer_mac.cc @@ -13,10 +13,10 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/spellcheck_messages.h" +#include "chrome/grit/generated_resources.h" #include "components/user_prefs/user_prefs.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/render_widget_host_view.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" diff --git a/chrome/browser/renderer_context_menu/spelling_bubble_model.cc b/chrome/browser/renderer_context_menu/spelling_bubble_model.cc index 8d78234..7e33491 100644 --- a/chrome/browser/renderer_context_menu/spelling_bubble_model.cc +++ b/chrome/browser/renderer_context_menu/spelling_bubble_model.cc @@ -9,8 +9,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.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/renderer_context_menu/spelling_menu_observer.cc b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc index b397709..1142069 100644 --- a/chrome/browser/renderer_context_menu/spelling_menu_observer.cc +++ b/chrome/browser/renderer_context_menu/spelling_menu_observer.cc @@ -22,12 +22,12 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/spellcheck_result.h" +#include "chrome/grit/generated_resources.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 "content/public/common/context_menu_params.h" #include "extensions/browser/view_type_utils.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/renderer_host/pepper/pepper_talk_host.cc b/chrome/browser/renderer_host/pepper/pepper_talk_host.cc index e5869ea..b144cad 100644 --- a/chrome/browser/renderer_host/pepper/pepper_talk_host.cc +++ b/chrome/browser/renderer_host/pepper/pepper_talk_host.cc @@ -5,10 +5,10 @@ #include "chrome/browser/renderer_host/pepper/pepper_talk_host.h" #include "base/bind.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_ppapi_host.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_frame_host.h" -#include "grit/generated_resources.h" #include "ppapi/c/pp_errors.h" #include "ppapi/host/dispatch_host_message.h" #include "ppapi/host/host_message_context.h" diff --git a/chrome/browser/repost_form_warning_controller.cc b/chrome/browser/repost_form_warning_controller.cc index ef22184..0dadfc9 100644 --- a/chrome/browser/repost_form_warning_controller.cc +++ b/chrome/browser/repost_form_warning_controller.cc @@ -4,9 +4,9 @@ #include "chrome/browser/repost_form_warning_controller.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" RepostFormWarningController::RepostFormWarningController( diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index caf5d28..f1c4a72 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -31,6 +31,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/google/core/browser/google_util.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/interstitial_page.h" @@ -38,7 +39,6 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "grit/browser_resources.h" -#include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/search/contextual_search_promo_source_android.cc b/chrome/browser/search/contextual_search_promo_source_android.cc index f15a355..16b9564 100644 --- a/chrome/browser/search/contextual_search_promo_source_android.cc +++ b/chrome/browser/search/contextual_search_promo_source_android.cc @@ -9,8 +9,8 @@ #include "base/strings/stringprintf.h" #include "base/values.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/chromium_strings.h" #include "grit/browser_resources.h" -#include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/webui/jstemplate_builder.h" diff --git a/chrome/browser/search/hotword_service.cc b/chrome/browser/search/hotword_service.cc index 2f75b03..65dcbdf 100644 --- a/chrome/browser/search/hotword_service.cc +++ b/chrome/browser/search/hotword_service.cc @@ -24,6 +24,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/plugin_service.h" @@ -32,7 +33,6 @@ #include "extensions/browser/uninstall_reason.h" #include "extensions/common/extension.h" #include "extensions/common/one_shot_event.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" using extensions::BrowserContextKeyedAPIFactory; diff --git a/chrome/browser/search/local_ntp_source.cc b/chrome/browser/search/local_ntp_source.cc index 4fd5cc53..203f805 100644 --- a/chrome/browser/search/local_ntp_source.cc +++ b/chrome/browser/search/local_ntp_source.cc @@ -17,10 +17,10 @@ #include "chrome/browser/search/search.h" #include "chrome/browser/search_engines/template_url_service_factory.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/search_engines/template_url_prepopulate_data.h" #include "components/search_engines/template_url_service.h" #include "grit/browser_resources.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/url_request/url_request.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/services/gcm/push_messaging_infobar_delegate.cc b/chrome/browser/services/gcm/push_messaging_infobar_delegate.cc index 68a3978..46cc906 100644 --- a/chrome/browser/services/gcm/push_messaging_infobar_delegate.cc +++ b/chrome/browser/services/gcm/push_messaging_infobar_delegate.cc @@ -4,8 +4,8 @@ #include "chrome/browser/services/gcm/push_messaging_infobar_delegate.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/shell_integration.cc b/chrome/browser/shell_integration.cc index 81415f7..aaeb320 100644 --- a/chrome/browser/shell_integration.cc +++ b/chrome/browser/shell_integration.cc @@ -24,7 +24,7 @@ #if !defined(OS_WIN) #include "chrome/common/chrome_version_info.h" -#include "grit/chromium_strings.h" +#include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" #endif diff --git a/chrome/browser/signin/signin_error_notifier_ash.cc b/chrome/browser/signin/signin_error_notifier_ash.cc index 9713889..b48dd85 100644 --- a/chrome/browser/signin/signin_error_notifier_ash.cc +++ b/chrome/browser/signin/signin_error_notifier_ash.cc @@ -24,8 +24,8 @@ #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/url_constants.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/WebKit/public/web/WebTextDirection.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/signin/signin_global_error.cc b/chrome/browser/signin/signin_global_error.cc index bbd7b7b..5131e09 100644 --- a/chrome/browser/signin/signin_global_error.cc +++ b/chrome/browser/signin/signin_global_error.cc @@ -19,10 +19,10 @@ #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/profile_management_switches.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "net/base/url_util.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/signin/signin_ui_util.cc b/chrome/browser/signin/signin_ui_util.cc index 6cd2249..6361658 100644 --- a/chrome/browser/signin/signin_ui_util.cc +++ b/chrome/browser/signin/signin_ui_util.cc @@ -18,11 +18,11 @@ #include "chrome/browser/sync/sync_global_error_factory.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "components/signin/core/common/profile_management_switches.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/font_list.h" #include "ui/gfx/text_elider.h" diff --git a/chrome/browser/ssl/ssl_add_certificate.cc b/chrome/browser/ssl/ssl_add_certificate.cc index e12c00c..0a79960 100644 --- a/chrome/browser/ssl/ssl_add_certificate.cc +++ b/chrome/browser/ssl/ssl_add_certificate.cc @@ -10,12 +10,12 @@ #include "chrome/browser/certificate_viewer.h" #include "chrome/browser/infobars/infobar_service.h" #include "chrome/browser/infobars/simple_alert_infobar_delegate.h" +#include "chrome/grit/generated_resources.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/render_frame_host.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_errors.h" #include "net/cert/cert_database.h" diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 5ab6ecc..fdfe9d4 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -24,6 +24,8 @@ #include "chrome/browser/ssl/ssl_error_classification.h" #include "chrome/browser/ssl/ssl_error_info.h" #include "chrome/common/chrome_switches.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/cert_store.h" #include "content/public/browser/interstitial_page.h" #include "content/public/browser/navigation_controller.h" @@ -36,8 +38,6 @@ #include "content/public/common/ssl_status.h" #include "grit/app_locale_settings.h" #include "grit/browser_resources.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "net/base/hash_value.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/chrome/browser/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc index e21d8f2..71bc546 100644 --- a/chrome/browser/ssl/ssl_error_info.cc +++ b/chrome/browser/ssl/ssl_error_info.cc @@ -7,9 +7,9 @@ #include "base/i18n/time_formatting.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/cert_store.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_errors.h" #include "net/cert/cert_status_flags.h" diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.cc b/chrome/browser/supervised_user/supervised_user_interstitial.cc index f561c45..8349992 100644 --- a/chrome/browser/supervised_user/supervised_user_interstitial.cc +++ b/chrome/browser/supervised_user/supervised_user_interstitial.cc @@ -14,6 +14,7 @@ #include "chrome/browser/supervised_user/supervised_user_service.h" #include "chrome/browser/supervised_user/supervised_user_service_factory.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/infobar.h" #include "components/infobars/core/infobar_delegate.h" #include "content/public/browser/browser_thread.h" @@ -24,7 +25,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "grit/browser_resources.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/webui/jstemplate_builder.h" diff --git a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc index 288f940..1e186b6 100644 --- a/chrome/browser/supervised_user/supervised_user_navigation_observer.cc +++ b/chrome/browser/supervised_user/supervised_user_navigation_observer.cc @@ -19,6 +19,7 @@ #include "chrome/browser/supervised_user/supervised_user_service_factory.h" #include "chrome/browser/supervised_user/supervised_user_url_filter.h" #include "chrome/browser/tab_contents/tab_util.h" +#include "chrome/grit/generated_resources.h" #include "components/infobars/core/confirm_infobar_delegate.h" #include "components/infobars/core/infobar.h" #include "content/public/browser/browser_thread.h" @@ -26,7 +27,6 @@ #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/user_metrics.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #if !defined(OS_ANDROID) diff --git a/chrome/browser/supervised_user/supervised_user_service.cc b/chrome/browser/supervised_user/supervised_user_service.cc index 0f8cab2..d52f159 100644 --- a/chrome/browser/supervised_user/supervised_user_service.cc +++ b/chrome/browser/supervised_user/supervised_user_service.cc @@ -35,6 +35,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" +#include "chrome/grit/generated_resources.h" #include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" @@ -42,7 +43,6 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/user_metrics.h" #include "google_apis/gaia/google_service_auth_error.h" -#include "grit/generated_resources.h" #include "net/base/escape.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index 8c338cd..62b8b76 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -64,6 +64,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/gcm_driver/gcm_driver.h" #include "components/invalidation/invalidation_service.h" #include "components/invalidation/profile_invalidation_provider.h" @@ -82,7 +83,6 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" -#include "grit/generated_resources.h" #include "net/cookies/cookie_monster.h" #include "net/url_request/url_request_context_getter.h" #include "sync/api/sync_error.h" diff --git a/chrome/browser/sync/profile_sync_service_android.cc b/chrome/browser/sync/profile_sync_service_android.cc index 3f5b517..2432f54 100644 --- a/chrome/browser/sync/profile_sync_service_android.cc +++ b/chrome/browser/sync/profile_sync_service_android.cc @@ -22,6 +22,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/sync/sync_ui_util.h" +#include "chrome/grit/generated_resources.h" #include "components/invalidation/object_id_invalidation_map.h" #include "components/signin/core/browser/signin_manager.h" #include "components/sync_driver/pref_names.h" @@ -32,7 +33,6 @@ #include "google/cacheinvalidation/types.pb.h" #include "google_apis/gaia/gaia_constants.h" #include "google_apis/gaia/google_service_auth_error.h" -#include "grit/generated_resources.h" #include "jni/ProfileSyncService_jni.h" #include "sync/internal_api/public/network_resources.h" #include "sync/internal_api/public/read_transaction.h" diff --git a/chrome/browser/sync/sync_error_notifier_ash.cc b/chrome/browser/sync/sync_error_notifier_ash.cc index f203dce..6f33066 100644 --- a/chrome/browser/sync/sync_error_notifier_ash.cc +++ b/chrome/browser/sync/sync_error_notifier_ash.cc @@ -18,8 +18,8 @@ #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/url_constants.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/WebKit/public/web/WebTextDirection.h" #include "ui/base/l10n/l10n_util.h" diff --git a/chrome/browser/sync/sync_global_error.cc b/chrome/browser/sync/sync_global_error.cc index d3f72b2a..227990b 100644 --- a/chrome/browser/sync/sync_global_error.cc +++ b/chrome/browser/sync/sync_global_error.cc @@ -15,8 +15,8 @@ #include "chrome/browser/ui/webui/signin/login_ui_service.h" #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "google_apis/gaia/google_service_auth_error.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" SyncGlobalError::SyncGlobalError(SyncErrorController* error_controller, diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 8143ca3..e220262 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -22,13 +22,13 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.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/chromium_strings.h" -#include "grit/generated_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" diff --git a/chrome/browser/sync/sync_ui_util_unittest.cc b/chrome/browser/sync/sync_ui_util_unittest.cc index 680c5f1..dbee15a 100644 --- a/chrome/browser/sync/sync_ui_util_unittest.cc +++ b/chrome/browser/sync/sync_ui_util_unittest.cc @@ -10,12 +10,12 @@ #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" #include "chrome/browser/sync/profile_sync_service_mock.h" #include "chrome/browser/sync/sync_ui_util.h" +#include "chrome/grit/generated_resources.h" #include "components/signin/core/browser/fake_auth_status_provider.h" #include "components/signin/core/browser/profile_oauth2_token_service.h" #include "components/signin/core/browser/signin_manager.h" #include "content/public/test/test_browser_thread.h" #include "content/public/test/test_browser_thread_bundle.h" -#include "grit/generated_resources.h" #include "testing/gmock/include/gmock/gmock-actions.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/task_manager/background_information.cc b/chrome/browser/task_manager/background_information.cc index 35d0c1d..09cdad9 100644 --- a/chrome/browser/task_manager/background_information.cc +++ b/chrome/browser/task_manager/background_information.cc @@ -17,6 +17,7 @@ #include "chrome/browser/task_manager/renderer_resource.h" #include "chrome/browser/task_manager/resource_provider.h" #include "chrome/browser/task_manager/task_manager.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" @@ -25,7 +26,6 @@ #include "extensions/browser/extension_registry.h" #include "extensions/browser/view_type_utils.h" #include "extensions/common/extension.h" -#include "grit/generated_resources.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/task_manager/browser_process_resource_provider.cc b/chrome/browser/task_manager/browser_process_resource_provider.cc index f136bc2..a8bc2c8 100644 --- a/chrome/browser/task_manager/browser_process_resource_provider.cc +++ b/chrome/browser/task_manager/browser_process_resource_provider.cc @@ -9,7 +9,7 @@ #include "chrome/browser/task_manager/resource_provider.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/common/chrome_switches.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/proxy/proxy_resolver_v8.h" #include "third_party/sqlite/sqlite3.h" diff --git a/chrome/browser/task_manager/child_process_resource_provider.cc b/chrome/browser/task_manager/child_process_resource_provider.cc index dbc31ee..070e7a4 100644 --- a/chrome/browser/task_manager/child_process_resource_provider.cc +++ b/chrome/browser/task_manager/child_process_resource_provider.cc @@ -10,11 +10,11 @@ #include "base/strings/string16.h" #include "chrome/browser/task_manager/resource_provider.h" #include "chrome/browser/task_manager/task_manager.h" +#include "chrome/grit/generated_resources.h" #include "components/nacl/common/nacl_process_type.h" #include "content/public/browser/browser_child_process_host_iterator.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_data.h" -#include "grit/generated_resources.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/task_manager/guest_information.cc b/chrome/browser/task_manager/guest_information.cc index e0926f2..1315035 100644 --- a/chrome/browser/task_manager/guest_information.cc +++ b/chrome/browser/task_manager/guest_information.cc @@ -12,6 +12,7 @@ #include "chrome/browser/task_manager/resource_provider.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/task_manager/task_manager_util.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" @@ -19,7 +20,6 @@ #include "content/public/browser/render_widget_host_iterator.h" #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/task_manager/printing_information.cc b/chrome/browser/task_manager/printing_information.cc index 83e8e7a..b98a897 100644 --- a/chrome/browser/task_manager/printing_information.cc +++ b/chrome/browser/task_manager/printing_information.cc @@ -15,11 +15,11 @@ #include "chrome/browser/task_manager/renderer_resource.h" #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/task_manager/task_manager_util.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index fc71459..ce2c93e 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -30,6 +30,7 @@ #include "chrome/browser/ui/browser_navigator.h" #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" +#include "chrome/grit/generated_resources.h" #include "components/nacl/browser/nacl_browser.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/gpu_data_manager.h" @@ -40,7 +41,6 @@ #include "content/public/browser/worker_service.h" #include "content/public/common/result_codes.h" #include "extensions/browser/extension_system.h" -#include "grit/generated_resources.h" #include "third_party/icu/source/i18n/unicode/coll.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index 8275879..8100f86 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -29,6 +29,7 @@ #include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/web_applications/web_app.h" #include "chrome/common/chrome_switches.h" +#include "chrome/grit/generated_resources.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" #include "components/infobars/core/confirm_infobar_delegate.h" @@ -39,7 +40,6 @@ #include "content/public/test/browser_test_utils.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" -#include "grit/generated_resources.h" #include "net/dns/mock_host_resolver.h" #include "net/test/embedded_test_server/embedded_test_server.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/task_manager/task_manager_browsertest_util.cc b/chrome/browser/task_manager/task_manager_browsertest_util.cc index 2746825..9b9220e 100644 --- a/chrome/browser/task_manager/task_manager_browsertest_util.cc +++ b/chrome/browser/task_manager/task_manager_browsertest_util.cc @@ -15,7 +15,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/task_manager/resource_provider.h" #include "chrome/browser/task_manager/task_manager.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/browser/task_manager/task_manager_unittest.cc b/chrome/browser/task_manager/task_manager_unittest.cc index be1fecc..2d089e4 100644 --- a/chrome/browser/task_manager/task_manager_unittest.cc +++ b/chrome/browser/task_manager/task_manager_unittest.cc @@ -9,7 +9,7 @@ #include "base/message_loop/message_loop.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/task_manager/resource_provider.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" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/task_manager/task_manager_util.cc b/chrome/browser/task_manager/task_manager_util.cc index b755e12..9b217c6 100644 --- a/chrome/browser/task_manager/task_manager_util.cc +++ b/chrome/browser/task_manager/task_manager_util.cc @@ -12,8 +12,8 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" namespace task_manager { diff --git a/chrome/browser/task_manager/task_manager_util_unittest.cc b/chrome/browser/task_manager/task_manager_util_unittest.cc index a1f9ccf..17fcdfd 100644 --- a/chrome/browser/task_manager/task_manager_util_unittest.cc +++ b/chrome/browser/task_manager/task_manager_util_unittest.cc @@ -5,7 +5,7 @@ #include "chrome/browser/task_manager/task_manager_util.h" #include "base/basictypes.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" namespace task_manager { diff --git a/chrome/browser/task_manager/web_contents_resource_provider.cc b/chrome/browser/task_manager/web_contents_resource_provider.cc index 5f8af8a..41b77b6 100644 --- a/chrome/browser/task_manager/web_contents_resource_provider.cc +++ b/chrome/browser/task_manager/web_contents_resource_provider.cc @@ -16,6 +16,7 @@ #include "chrome/browser/task_manager/task_manager.h" #include "chrome/browser/task_manager/task_manager_util.h" #include "chrome/browser/task_manager/web_contents_information.h" +#include "chrome/grit/generated_resources.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_view_host.h" @@ -23,7 +24,6 @@ #include "content/public/browser/site_instance.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/ui/cocoa/ui_localizer.mm b/chrome/browser/ui/cocoa/ui_localizer.mm index 139f93e..06366a3 100644 --- a/chrome/browser/ui/cocoa/ui_localizer.mm +++ b/chrome/browser/ui/cocoa/ui_localizer.mm @@ -10,8 +10,8 @@ #include "base/logging.h" #include "base/strings/sys_string_conversions.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "grit/ui_strings.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/undo/bookmark_undo_service.cc b/chrome/browser/undo/bookmark_undo_service.cc index b010d14..987f685 100644 --- a/chrome/browser/undo/bookmark_undo_service.cc +++ b/chrome/browser/undo/bookmark_undo_service.cc @@ -9,11 +9,11 @@ #include "chrome/browser/undo/bookmark_renumber_observer.h" #include "chrome/browser/undo/bookmark_undo_service_factory.h" #include "chrome/browser/undo/undo_operation.h" +#include "chrome/grit/generated_resources.h" #include "components/bookmarks/browser/bookmark_model.h" #include "components/bookmarks/browser/bookmark_node_data.h" #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" -#include "grit/generated_resources.h" using bookmarks::BookmarkNodeData; diff --git a/chrome/browser/undo/undo_manager.cc b/chrome/browser/undo/undo_manager.cc index 94e28f4..3410e95 100644 --- a/chrome/browser/undo/undo_manager.cc +++ b/chrome/browser/undo/undo_manager.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "chrome/browser/undo/undo_manager_observer.h" #include "chrome/browser/undo/undo_operation.h" -#include "grit/generated_resources.h" +#include "chrome/grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm index a49e357..fcf3568 100644 --- a/chrome/browser/web_applications/web_app_mac.mm +++ b/chrome/browser/web_applications/web_app_mac.mm @@ -28,7 +28,6 @@ #include "base/version.h" #include "chrome/browser/browser_process.h" #import "chrome/browser/mac/dock.h" -#include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/shell_integration.h" @@ -38,12 +37,12 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #import "chrome/common/mac/app_mode_common.h" +#include "chrome/grit/generated_resources.h" #include "components/crx_file/id_util.h" #include "content/public/browser/browser_thread.h" #include "extensions/browser/extension_registry.h" #include "extensions/common/extension.h" #include "grit/chrome_unscaled_resources.h" -#include "grit/generated_resources.h" #import "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColor.h" diff --git a/chrome/browser/webdata/web_data_service_factory.cc b/chrome/browser/webdata/web_data_service_factory.cc index 8020fb8..18f9c40 100644 --- a/chrome/browser/webdata/web_data_service_factory.cc +++ b/chrome/browser/webdata/web_data_service_factory.cc @@ -11,6 +11,8 @@ #include "chrome/browser/sync/glue/sync_start_util.h" #include "chrome/browser/ui/profile_error_dialog.h" #include "chrome/browser/webdata/autocomplete_syncable_service.h" +#include "chrome/grit/chromium_strings.h" +#include "chrome/grit/generated_resources.h" #include "components/autofill/core/browser/autofill_country.h" #include "components/autofill/core/browser/webdata/autofill_profile_syncable_service.h" #include "components/autofill/core/browser/webdata/autofill_table.h" @@ -23,8 +25,6 @@ #include "components/signin/core/browser/webdata/token_web_data.h" #include "components/webdata/common/webdata_constants.h" #include "content/public/browser/browser_thread.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #if defined(OS_WIN) #include "components/password_manager/core/browser/webdata/password_web_data_service_win.h" |