diff options
Diffstat (limited to 'chrome')
192 files changed, 6 insertions, 267 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc index 150e8c9..12f1418 100644 --- a/chrome/app/chrome_main_delegate.cc +++ b/chrome/app/chrome_main_delegate.cc @@ -44,7 +44,6 @@ #include <atlbase.h> #include <malloc.h> #include <algorithm> -#include "base/strings/string_util.h" #include "chrome/common/child_process_logging.h" #include "chrome/common/terminate_on_heap_corruption_experiment_win.h" #include "sandbox/win/src/sandbox.h" @@ -56,11 +55,9 @@ #include "base/mac/os_crash_dumps.h" #include "chrome/app/chrome_main_mac.h" #include "chrome/browser/mac/relauncher.h" -#include "chrome/common/chrome_paths_internal.h" #include "chrome/common/mac/cfbundle_blocker.h" #include "chrome/common/mac/objc_zombie.h" #include "components/breakpad/app/breakpad_mac.h" -#include "grit/chromium_strings.h" #include "ui/base/l10n/l10n_util_mac.h" #endif diff --git a/chrome/browser/android/omnibox/autocomplete_controller_android.cc b/chrome/browser/android/omnibox/autocomplete_controller_android.cc index e0aefc7..5cd45ec 100644 --- a/chrome/browser/android/omnibox/autocomplete_controller_android.cc +++ b/chrome/browser/android/omnibox/autocomplete_controller_android.cc @@ -50,7 +50,6 @@ #include "net/base/escape.h" #include "net/base/net_util.h" #include "net/base/registry_controlled_domains/registry_controlled_domain.h" -#include "ui/base/resource/resource_bundle.h" using base::android::AttachCurrentThread; using base::android::ConvertJavaStringToUTF16; diff --git a/chrome/browser/android/provider/chrome_browser_provider.cc b/chrome/browser/android/provider/chrome_browser_provider.cc index 3a2ee3f..d47bc4c 100644 --- a/chrome/browser/android/provider/chrome_browser_provider.cc +++ b/chrome/browser/android/provider/chrome_browser_provider.cc @@ -38,10 +38,8 @@ #include "components/search_engines/template_url_service.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" -#include "grit/generated_resources.h" #include "jni/ChromeBrowserProvider_jni.h" #include "sql/statement.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/favicon_size.h" diff --git a/chrome/browser/chrome_browser_main_android.cc b/chrome/browser/chrome_browser_main_android.cc index e18ad01..d7adf4c 100644 --- a/chrome/browser/chrome_browser_main_android.cc +++ b/chrome/browser/chrome_browser_main_android.cc @@ -16,7 +16,6 @@ #include "content/public/common/main_function_params.h" #include "net/android/network_change_notifier_factory_android.h" #include "net/base/network_change_notifier.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" ChromeBrowserMainPartsAndroid::ChromeBrowserMainPartsAndroid( diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc index 1d40642..3146874 100644 --- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc +++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc @@ -63,7 +63,6 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "media/audio/sounds/sounds_manager.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/keyboard/keyboard_controller.h" #include "ui/keyboard/keyboard_util.h" diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc index fb5d99e..a02ac62 100644 --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc @@ -110,7 +110,6 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/power_save_blocker.h" #include "content/public/common/main_function_params.h" -#include "grit/platform_locale_settings.h" #include "media/audio/sounds/sounds_manager.h" #include "net/base/network_change_notifier.h" #include "net/url_request/url_request.h" diff --git a/chrome/browser/chromeos/imageburner/burn_controller.cc b/chrome/browser/chromeos/imageburner/burn_controller.cc index 615d063..48b32bf 100644 --- a/chrome/browser/chromeos/imageburner/burn_controller.cc +++ b/chrome/browser/chromeos/imageburner/burn_controller.cc @@ -9,7 +9,6 @@ #include "base/memory/weak_ptr.h" #include "chrome/browser/chromeos/imageburner/burn_manager.h" #include "chromeos/network/network_state_handler.h" -#include "grit/generated_resources.h" #include "url/gurl.h" namespace chromeos { diff --git a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc index 2c8f9b1..da79a35 100644 --- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc @@ -13,7 +13,6 @@ #include "chromeos/ime/fake_input_method_delegate.h" #include "chromeos/ime/input_method_manager.h" #include "chromeos/ime/input_method_whitelist.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/chromeos/login/auth/login_performer.cc b/chrome/browser/chromeos/login/auth/login_performer.cc index d9d184a..ec9c19f 100644 --- a/chrome/browser/chromeos/login/auth/login_performer.cc +++ b/chrome/browser/chromeos/login/auth/login_performer.cc @@ -34,13 +34,10 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/user_metrics.h" #include "google_apis/gaia/gaia_auth_util.h" -#include "grit/generated_resources.h" #include "net/cookies/cookie_monster.h" #include "net/cookies/cookie_store.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" using base::UserMetricsAction; using content::BrowserThread; diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc index 9b05d72..247b27e 100644 --- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc @@ -35,7 +35,6 @@ #include "chromeos/login/auth/authenticator.h" #include "chromeos/login/auth/key.h" #include "chromeos/login/auth/mock_authenticator.h" -#include "chromeos/login/auth/mock_authenticator.h" #include "chromeos/login/auth/user_context.h" #include "chromeos/settings/cros_settings_names.h" #include "components/policy/core/common/cloud/cloud_policy_constants.h" @@ -48,10 +47,8 @@ #include "content/public/test/mock_notification_observer.h" #include "content/public/test/test_utils.h" #include "google_apis/gaia/mock_url_fetcher_factory.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" using ::testing::AnyNumber; using ::testing::Invoke; diff --git a/chrome/browser/chromeos/login/helper.cc b/chrome/browser/chromeos/login/helper.cc index cdea1e2..d7bb170 100644 --- a/chrome/browser/chromeos/login/helper.cc +++ b/chrome/browser/chromeos/login/helper.cc @@ -16,7 +16,6 @@ #include "grit/theme_resources.h" #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" #include "ui/gfx/screen.h" diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc index 8f194f4..1b48340 100644 --- a/chrome/browser/chromeos/login/lock/screen_locker.cc +++ b/chrome/browser/chromeos/login/lock/screen_locker.cc @@ -53,7 +53,6 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "media/audio/sounds/sounds_manager.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" #include "url/gurl.h" diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc index 55db8de..628bb72 100644 --- a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc +++ b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc @@ -30,7 +30,6 @@ #include "content/public/browser/web_ui.h" #include "ui/aura/client/capture_client.h" #include "ui/aura/window_event_dispatcher.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/x/x11_util.h" #include "ui/gfx/screen.h" #include "ui/keyboard/keyboard_controller.h" diff --git a/chrome/browser/chromeos/login/screens/network_screen.cc b/chrome/browser/chromeos/login/screens/network_screen.cc index 2eca11c..5435119 100644 --- a/chrome/browser/chromeos/login/screens/network_screen.cc +++ b/chrome/browser/chromeos/login/screens/network_screen.cc @@ -19,7 +19,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/chromeos/login/screens/user_image_screen.cc b/chrome/browser/chromeos/login/screens/user_image_screen.cc index 8fa186b..1a95766 100644 --- a/chrome/browser/chromeos/login/screens/user_image_screen.cc +++ b/chrome/browser/chromeos/login/screens/user_image_screen.cc @@ -36,12 +36,8 @@ #include "components/user_manager/user_image/user_image.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 "policy/policy_constants.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/base/webui/web_ui_util.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc index 3065c4c..9e6d4a5 100644 --- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc +++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc @@ -28,9 +28,7 @@ #include "chromeos/chromeos_switches.h" #include "chromeos/settings/cros_settings_names.h" #include "chromeos/settings/cros_settings_provider.h" -#include "grit/ash_resources.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" using namespace ash; diff --git a/chrome/browser/chromeos/login/version_info_updater.cc b/chrome/browser/chromeos/login/version_info_updater.cc index 876a689..0a36952 100644 --- a/chrome/browser/chromeos/login/version_info_updater.cc +++ b/chrome/browser/chromeos/login/version_info_updater.cc @@ -22,7 +22,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/wizard_controller.cc b/chrome/browser/chromeos/login/wizard_controller.cc index fc725c0..3dba85a 100644 --- a/chrome/browser/chromeos/login/wizard_controller.cc +++ b/chrome/browser/chromeos/login/wizard_controller.cc @@ -76,7 +76,6 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_types.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/l10n/l10n_util.h" using content::BrowserThread; diff --git a/chrome/browser/chromeos/net/network_portal_detector_impl.cc b/chrome/browser/chromeos/net/network_portal_detector_impl.cc index d79755e..84ca59d 100644 --- a/chrome/browser/chromeos/net/network_portal_detector_impl.cc +++ b/chrome/browser/chromeos/net/network_portal_detector_impl.cc @@ -19,10 +19,8 @@ #include "chromeos/network/network_state_handler.h" #include "content/public/browser/notification_service.h" #include "content/public/common/content_switches.h" -#include "grit/generated_resources.h" #include "net/http/http_status_code.h" #include "third_party/cros_system_api/dbus/service_constants.h" -#include "ui/base/l10n/l10n_util.h" using captive_portal::CaptivePortalDetector; diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc index 4cf6339..0c97c1f 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.cc +++ b/chrome/browser/chromeos/offline/offline_load_page.cc @@ -40,7 +40,6 @@ #include "grit/theme_resources.h" #include "net/base/escape.h" #include "net/base/net_errors.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/webui/jstemplate_builder.h" #include "ui/base/webui/web_ui_util.h" diff --git a/chrome/browser/chromeos/options/vpn_config_view.cc b/chrome/browser/chromeos/options/vpn_config_view.cc index 5894356..a2883c0 100644 --- a/chrome/browser/chromeos/options/vpn_config_view.cc +++ b/chrome/browser/chromeos/options/vpn_config_view.cc @@ -27,7 +27,6 @@ #include "third_party/cros_system_api/dbus/service_constants.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/combobox_model.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/events/event.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/combobox/combobox.h" diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc index 8022a2c..6f47d2e 100644 --- a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc +++ b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc @@ -21,7 +21,6 @@ #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile_manager.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/l10n/l10n_util.h" using base::ASCIIToUTF16; diff --git a/chrome/browser/chromeos/set_time_dialog.cc b/chrome/browser/chromeos/set_time_dialog.cc index fb68b8d..ca43412 100644 --- a/chrome/browser/chromeos/set_time_dialog.cc +++ b/chrome/browser/chromeos/set_time_dialog.cc @@ -8,8 +8,6 @@ #include "chrome/browser/ui/browser_dialogs.h" #include "chrome/common/url_constants.h" #include "content/public/browser/user_metrics.h" -#include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/gfx/size.h" using content::WebContents; diff --git a/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.cc b/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.cc index ffb59e0..14fe316 100644 --- a/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.cc +++ b/chrome/browser/chromeos/ui/screen_capture_notification_ui_chromeos.cc @@ -6,8 +6,6 @@ #include "ash/shell.h" #include "ash/system/tray/system_tray_notifier.h" -#include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/ui_proxy_config_service.cc b/chrome/browser/chromeos/ui_proxy_config_service.cc index 8f694dd..490c043 100644 --- a/chrome/browser/chromeos/ui_proxy_config_service.cc +++ b/chrome/browser/chromeos/ui_proxy_config_service.cc @@ -11,7 +11,6 @@ #include "chrome/browser/chromeos/proxy_config_service_impl.h" #include "chromeos/network/network_state.h" #include "chromeos/network/network_state_handler.h" -#include "grit/generated_resources.h" #include "net/proxy/proxy_config.h" namespace chromeos { diff --git a/chrome/browser/content_settings/permission_context_base.cc b/chrome/browser/content_settings/permission_context_base.cc index 05100d6..b85f0a7 100644 --- a/chrome/browser/content_settings/permission_context_base.cc +++ b/chrome/browser/content_settings/permission_context_base.cc @@ -17,8 +17,6 @@ #include "chrome/common/pref_names.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" -#include "grit/theme_resources.h" PermissionContextBase::PermissionContextBase( Profile* profile, diff --git a/chrome/browser/diagnostics/diagnostics_writer.cc b/chrome/browser/diagnostics/diagnostics_writer.cc index 7e75d10..8bd4b40 100644 --- a/chrome/browser/diagnostics/diagnostics_writer.cc +++ b/chrome/browser/diagnostics/diagnostics_writer.cc @@ -16,12 +16,10 @@ #include "base/basictypes.h" #include "base/command_line.h" #include "base/logging.h" -#include "base/logging.h" #include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/common/chrome_switches.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" namespace diagnostics { diff --git a/chrome/browser/download/download_file_picker.cc b/chrome/browser/download/download_file_picker.cc index b1af519..ac734ea 100644 --- a/chrome/browser/download/download_file_picker.cc +++ b/chrome/browser/download/download_file_picker.cc @@ -12,8 +12,6 @@ #include "content/public/browser/download_item.h" #include "content/public/browser/download_manager.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" using content::DownloadItem; using content::DownloadManager; diff --git a/chrome/browser/download/download_item_model_unittest.cc b/chrome/browser/download/download_item_model_unittest.cc index 4917747..071d4ec 100644 --- a/chrome/browser/download/download_item_model_unittest.cc +++ b/chrome/browser/download/download_item_model_unittest.cc @@ -14,10 +14,8 @@ #include "base/strings/utf_string_conversions.h" #include "content/public/test/mock_download_item.h" #include "extensions/common/extension.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" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/bytes_formatting.h" #include "ui/gfx/font_list.h" diff --git a/chrome/browser/download/download_status_updater_win.cc b/chrome/browser/download/download_status_updater_win.cc index 35d82b2..5ab6d8f 100644 --- a/chrome/browser/download/download_status_updater_win.cc +++ b/chrome/browser/download/download_status_updater_win.cc @@ -13,8 +13,6 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_iterator.h" #include "chrome/browser/ui/browser_window.h" -#include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/views/win/hwnd_util.h" namespace { diff --git a/chrome/browser/extensions/activity_log/ad_network_database.cc b/chrome/browser/extensions/activity_log/ad_network_database.cc index 4a5a859..1dde3e2 100644 --- a/chrome/browser/extensions/activity_log/ad_network_database.cc +++ b/chrome/browser/extensions/activity_log/ad_network_database.cc @@ -6,8 +6,6 @@ #include "base/lazy_instance.h" #include "chrome/browser/extensions/activity_log/hashed_ad_network_database.h" -#include "grit/browser_resources.h" -#include "ui/base/resource/resource_bundle.h" namespace extensions { diff --git a/chrome/browser/extensions/api/identity/identity_apitest.cc b/chrome/browser/extensions/api/identity/identity_apitest.cc index f1564dd..67f69d4 100644 --- a/chrome/browser/extensions/api/identity/identity_apitest.cc +++ b/chrome/browser/extensions/api/identity/identity_apitest.cc @@ -43,7 +43,6 @@ #include "extensions/common/id_util.h" #include "google_apis/gaia/google_service_auth_error.h" #include "google_apis/gaia/oauth2_mint_token_flow.h" -#include "grit/browser_resources.h" #include "net/test/spawned_test_server/spawned_test_server.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/extensions/api/tabs/tabs_api.cc b/chrome/browser/extensions/api/tabs/tabs_api.cc index 39ad1eb..cef53ff 100644 --- a/chrome/browser/extensions/api/tabs/tabs_api.cc +++ b/chrome/browser/extensions/api/tabs/tabs_api.cc @@ -72,7 +72,6 @@ #include "extensions/common/constants.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" -#include "extensions/common/extension_l10n_util.h" #include "extensions/common/extension_messages.h" #include "extensions/common/manifest_constants.h" #include "extensions/common/message_bundle.h" diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc index 83732cf..addd6ca 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_api.cc @@ -51,10 +51,7 @@ #include "extensions/browser/extension_util.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" -#include "extensions/common/extension_l10n_util.h" #include "google_apis/gaia/google_service_auth_error.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc index c876524..1f35afa 100644 --- a/chrome/browser/extensions/bookmark_app_helper.cc +++ b/chrome/browser/extensions/bookmark_app_helper.cc @@ -28,7 +28,6 @@ #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_analysis.h" #include "ui/gfx/color_utils.h" diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index f5294a5..2228271 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -61,7 +61,6 @@ #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/users/user_manager.h" diff --git a/chrome/browser/extensions/default_apps.cc b/chrome/browser/extensions/default_apps.cc index fdae3ad..2e81880 100644 --- a/chrome/browser/extensions/default_apps.cc +++ b/chrome/browser/extensions/default_apps.cc @@ -9,6 +9,7 @@ #include "base/command_line.h" #include "base/prefs/pref_service.h" +#include "base/strings/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/chrome_switches.h" @@ -17,7 +18,6 @@ #include "chrome/common/pref_names.h" #include "components/pref_registry/pref_registry_syncable.h" #include "extensions/common/extension.h" -#include "ui/base/l10n/l10n_util.h" #if !defined(OS_ANDROID) #include "chrome/browser/first_run/first_run.h" diff --git a/chrome/browser/extensions/extension_message_bubble_controller.cc b/chrome/browser/extensions/extension_message_bubble_controller.cc index 4a08214..1917156 100644 --- a/chrome/browser/extensions/extension_message_bubble_controller.cc +++ b/chrome/browser/extensions/extension_message_bubble_controller.cc @@ -14,9 +14,6 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/user_metrics.h" #include "extensions/browser/extension_registry.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/extension_uninstall_dialog.cc b/chrome/browser/extensions/extension_uninstall_dialog.cc index 619b9be..16bfe22 100644 --- a/chrome/browser/extensions/extension_uninstall_dialog.cc +++ b/chrome/browser/extensions/extension_uninstall_dialog.cc @@ -20,7 +20,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" #include "ui/gfx/image/image_skia.h" diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc index 41983db..b5a971b 100644 --- a/chrome/browser/history/history_service.cc +++ b/chrome/browser/history/history_service.cc @@ -58,8 +58,6 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_item.h" #include "content/public/browser/notification_service.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "sync/api/sync_error_factory.h" #include "third_party/skia/include/core/SkBitmap.h" diff --git a/chrome/browser/infobars/infobar_extension_api.cc b/chrome/browser/infobars/infobar_extension_api.cc index 3c989d6..8f5b220 100644 --- a/chrome/browser/infobars/infobar_extension_api.cc +++ b/chrome/browser/infobars/infobar_extension_api.cc @@ -17,7 +17,6 @@ #include "extensions/browser/extension_host.h" #include "extensions/common/error_utils.h" #include "extensions/common/extension.h" -#include "grit/generated_resources.h" bool InfobarsShowFunction::RunSync() { base::DictionaryValue* args; diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 1e2bd0e..fc505c0 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -38,7 +38,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/escape.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/webui/web_ui_util.h" #include "ui/message_center/notifier_settings.h" diff --git a/chrome/browser/platform_util_mac.mm b/chrome/browser/platform_util_mac.mm index b6df240..20afdcd 100644 --- a/chrome/browser/platform_util_mac.mm +++ b/chrome/browser/platform_util_mac.mm @@ -13,9 +13,6 @@ #include "base/mac/mac_logging.h" #include "base/mac/scoped_aedesc.h" #include "base/strings/sys_string_conversions.h" -#include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/base/l10n/l10n_util_mac.h" #include "url/gurl.h" namespace platform_util { diff --git a/chrome/browser/policy/configuration_policy_handler_list_factory.cc b/chrome/browser/policy/configuration_policy_handler_list_factory.cc index 7463726..9f8f044 100644 --- a/chrome/browser/policy/configuration_policy_handler_list_factory.cc +++ b/chrome/browser/policy/configuration_policy_handler_list_factory.cc @@ -25,7 +25,6 @@ #include "components/policy/core/common/schema.h" #include "components/search_engines/default_search_policy_handler.h" #include "components/translate/core/common/translate_pref_names.h" -#include "grit/components_strings.h" #include "policy/policy_constants.h" #if !defined(OS_IOS) diff --git a/chrome/browser/policy/managed_bookmarks_policy_handler.cc b/chrome/browser/policy/managed_bookmarks_policy_handler.cc index b2495e6..e95f1d9 100644 --- a/chrome/browser/policy/managed_bookmarks_policy_handler.cc +++ b/chrome/browser/policy/managed_bookmarks_policy_handler.cc @@ -11,7 +11,6 @@ #include "components/policy/core/browser/policy_error_map.h" #include "components/policy/core/common/policy_map.h" #include "components/url_fixer/url_fixer.h" -#include "grit/components_strings.h" #include "policy/policy_constants.h" #include "url/gurl.h" diff --git a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc index a4c07b6..0eaeb8a 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc @@ -29,9 +29,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/service_messages.h" #include "content/public/browser/browser_thread.h" -#include "grit/generated_resources.h" #include "printing/backend/print_backend.h" -#include "ui/base/l10n/l10n_util.h" using content::BrowserThread; diff --git a/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc b/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc index 407eb18..91ed0fe 100644 --- a/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc +++ b/chrome/browser/profiles/incognito_mode_policy_handler_unittest.cc @@ -7,7 +7,6 @@ #include "chrome/common/pref_names.h" #include "components/policy/core/browser/configuration_policy_pref_store.h" #include "components/policy/core/browser/configuration_policy_pref_store_test.h" -#include "grit/generated_resources.h" #include "policy/policy_constants.h" namespace policy { diff --git a/chrome/browser/profiles/profile_avatar_icon_util.cc b/chrome/browser/profiles/profile_avatar_icon_util.cc index 6b17967..79251a1 100644 --- a/chrome/browser/profiles/profile_avatar_icon_util.cc +++ b/chrome/browser/profiles/profile_avatar_icon_util.cc @@ -18,7 +18,6 @@ #include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/core/SkScalar.h" #include "third_party/skia/include/core/SkXfermode.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/image/canvas_image_source.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/search/iframe_source.cc b/chrome/browser/search/iframe_source.cc index 26250d3..e3f0b4e 100644 --- a/chrome/browser/search/iframe_source.cc +++ b/chrome/browser/search/iframe_source.cc @@ -12,7 +12,6 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/web_contents.h" -#include "grit/browser_resources.h" #include "net/url_request/url_request.h" #include "ui/base/resource/resource_bundle.h" #include "url/gurl.h" diff --git a/chrome/browser/search/search.cc b/chrome/browser/search/search.cc index 75a0015..a758841 100644 --- a/chrome/browser/search/search.cc +++ b/chrome/browser/search/search.cc @@ -34,8 +34,6 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" #if defined(ENABLE_MANAGED_USERS) #include "chrome/browser/supervised_user/supervised_user_service.h" diff --git a/chrome/browser/signin/signin_promo.cc b/chrome/browser/signin/signin_promo.cc index ec0a6a7..86c4585 100644 --- a/chrome/browser/signin/signin_promo.cc +++ b/chrome/browser/signin/signin_promo.cc @@ -30,13 +30,9 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "google_apis/gaia/gaia_urls.h" -#include "grit/browser_resources.h" -#include "grit/generated_resources.h" -#include "grit/theme_resources.h" #include "net/base/escape.h" #include "net/base/network_change_notifier.h" #include "net/base/url_util.h" -#include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" using content::WebContents; diff --git a/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc b/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc index 1ca960b..680d68e 100644 --- a/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc +++ b/chrome/browser/speech/extension_api/tts_engine_extension_observer.cc @@ -17,7 +17,6 @@ #include "components/keyed_service/core/keyed_service.h" #include "extensions/browser/event_router.h" #include "extensions/browser/extension_system.h" -#include "grit/browser_resources.h" // Factory to load one instance of TtsExtensionLoaderChromeOs per profile. class TtsEngineExtensionObserverFactory diff --git a/chrome/browser/status_icons/status_icon_menu_model.cc b/chrome/browser/status_icons/status_icon_menu_model.cc index bfb7a4b..eee644e 100644 --- a/chrome/browser/status_icons/status_icon_menu_model.cc +++ b/chrome/browser/status_icons/status_icon_menu_model.cc @@ -7,7 +7,6 @@ #include "base/bind.h" #include "base/message_loop/message_loop.h" #include "ui/base/accelerators/accelerator.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image.h" struct StatusIconMenuModel::ItemState { diff --git a/chrome/browser/supervised_user/supervised_user_browsertest.cc b/chrome/browser/supervised_user/supervised_user_browsertest.cc index 480d625..bbe40e0 100644 --- a/chrome/browser/supervised_user/supervised_user_browsertest.cc +++ b/chrome/browser/supervised_user/supervised_user_browsertest.cc @@ -35,9 +35,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" #include "content/public/test/browser_test_utils.h" -#include "grit/generated_resources.h" #include "testing/gmock/include/gmock/gmock.h" -#include "ui/base/l10n/l10n_util.h" using content::InterstitialPage; using content::NavigationController; diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index fb373b9..3a15e24 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -35,7 +35,6 @@ #include "sync/protocol/proto_enum_conversions.h" #include "sync/protocol/sync_protocol_error.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/users/user_manager.h" diff --git a/chrome/browser/task_manager/printing_information.cc b/chrome/browser/task_manager/printing_information.cc index fcc4ca7..83e8e7a 100644 --- a/chrome/browser/task_manager/printing_information.cc +++ b/chrome/browser/task_manager/printing_information.cc @@ -21,7 +21,6 @@ #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" using content::WebContents; diff --git a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc index 5db1d3d..c347186 100644 --- a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc +++ b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.cc @@ -34,10 +34,8 @@ #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 "jni/AutofillDialogControllerAndroid_jni.h" #include "ui/base/android/window_android.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/combobox_model.h" #include "ui/base/models/menu_model.h" #include "ui/gfx/android/java_bitmap.h" diff --git a/chrome/browser/ui/android/autofill/autofill_dialog_result.cc b/chrome/browser/ui/android/autofill/autofill_dialog_result.cc index e596d7f..d17ff4c 100644 --- a/chrome/browser/ui/android/autofill/autofill_dialog_result.cc +++ b/chrome/browser/ui/android/autofill/autofill_dialog_result.cc @@ -17,7 +17,6 @@ #include "components/autofill/core/browser/credit_card.h" #include "components/autofill/core/common/form_data.h" #include "jni/AutofillDialogResult_jni.h" -#include "ui/base/l10n/l10n_util.h" namespace autofill { diff --git a/chrome/browser/ui/android/infobars/translate_infobar.cc b/chrome/browser/ui/android/infobars/translate_infobar.cc index 52a6ec6..a8e1ec3 100644 --- a/chrome/browser/ui/android/infobars/translate_infobar.cc +++ b/chrome/browser/ui/android/infobars/translate_infobar.cc @@ -9,9 +9,7 @@ #include "base/android/jni_weak_ref.h" #include "chrome/browser/translate/chrome_translate_client.h" #include "components/translate/core/browser/translate_infobar_delegate.h" -#include "grit/generated_resources.h" #include "jni/TranslateInfoBarDelegate_jni.h" -#include "ui/base/l10n/l10n_util.h" // ChromeTranslateClient // ---------------------------------------------------------- diff --git a/chrome/browser/ui/app_list/search/people/person.cc b/chrome/browser/ui/app_list/search/people/person.cc index 3e2a7de..4c5b3f2 100644 --- a/chrome/browser/ui/app_list/search/people/person.cc +++ b/chrome/browser/ui/app_list/search/people/person.cc @@ -8,7 +8,6 @@ #include "base/strings/string_number_conversions.h" #include "base/values.h" -#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/autofill/account_chooser_model.cc b/chrome/browser/ui/autofill/account_chooser_model.cc index 2362dbe..778b889 100644 --- a/chrome/browser/ui/autofill/account_chooser_model.cc +++ b/chrome/browser/ui/autofill/account_chooser_model.cc @@ -16,7 +16,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" namespace autofill { diff --git a/chrome/browser/ui/autofill/autofill_dialog_models.cc b/chrome/browser/ui/autofill/autofill_dialog_models.cc index 66239e3..dbe26f2 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_models.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_models.cc @@ -15,7 +15,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" namespace autofill { diff --git a/chrome/browser/ui/autofill/autofill_dialog_types.cc b/chrome/browser/ui/autofill/autofill_dialog_types.cc index c1a33dc..2e4793d 100644 --- a/chrome/browser/ui/autofill/autofill_dialog_types.cc +++ b/chrome/browser/ui/autofill/autofill_dialog_types.cc @@ -7,8 +7,6 @@ #include "base/logging.h" #include "base/strings/string_split.h" #include "base/strings/string_util.h" -#include "grit/generated_resources.h" -#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc b/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc index 747b9a5..41b1226 100644 --- a/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc +++ b/chrome/browser/ui/autofill/password_generation_popup_controller_impl.cc @@ -26,7 +26,6 @@ #include "grit/generated_resources.h" #include "grit/google_chrome_strings.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/rect_conversions.h" #include "ui/gfx/text_utils.h" diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc index 9327fbb..b8798c2 100644 --- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc +++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc @@ -22,7 +22,6 @@ #include "components/bookmarks/test/bookmark_test_helpers.h" #include "content/public/browser/page_navigator.h" #include "content/public/test/test_browser_thread.h" -#include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/clipboard/clipboard.h" diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_window_controller.mm b/chrome/browser/ui/cocoa/autofill/autofill_dialog_window_controller.mm index 05215d8..0f7bf68 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_window_controller.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_window_controller.mm @@ -20,10 +20,8 @@ #import "chrome/browser/ui/cocoa/autofill/autofill_textfield.h" #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_window.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #import "ui/base/cocoa/flipped_view.h" #include "ui/base/cocoa/window_size_constants.h" -#include "ui/base/l10n/l10n_util.h" // The minimum useful height of the contents area of the dialog. const CGFloat kMinimumContentsHeight = 101; diff --git a/chrome/browser/ui/cocoa/autofill/autofill_main_container.mm b/chrome/browser/ui/cocoa/autofill/autofill_main_container.mm index 1407faf..e24adfe 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_main_container.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_main_container.mm @@ -24,7 +24,6 @@ #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #import "ui/base/cocoa/controls/blue_label_button.h" #include "ui/base/cocoa/window_size_constants.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/gfx/range/range.h" namespace { diff --git a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm index ab2a029..a319fae 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_cocoa.mm @@ -10,7 +10,6 @@ #include "chrome/browser/ui/autofill/popup_constants.h" #include "chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h" #include "components/autofill/core/browser/popup_item_ids.h" -#include "grit/ui_resources.h" #include "ui/base/cocoa/window_size_constants.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font_list.h" diff --git a/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm index 47afd51..bed1b6b 100644 --- a/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm +++ b/chrome/browser/ui/cocoa/autofill/autofill_section_container_unittest.mm @@ -12,7 +12,6 @@ #import "chrome/browser/ui/cocoa/autofill/autofill_input_field.h" #import "chrome/browser/ui/cocoa/autofill/layout_view.h" #import "chrome/browser/ui/cocoa/menu_button.h" -#include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/gtest_mac.h" #include "testing/platform_test.h" diff --git a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.mm b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.mm index 985ae78..a8a85fd 100644 --- a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.mm +++ b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa.mm @@ -14,7 +14,6 @@ #import "chrome/browser/ui/cocoa/hyperlink_text_view.h" #import "chrome/browser/ui/cocoa/l10n_util.h" #include "components/autofill/core/browser/popup_item_ids.h" -#include "grit/ui_resources.h" #include "skia/ext/skia_utils_mac.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font_list.h" diff --git a/chrome/browser/ui/cocoa/base_bubble_controller.mm b/chrome/browser/ui/cocoa/base_bubble_controller.mm index 8c26ee4..7be153a 100644 --- a/chrome/browser/ui/cocoa/base_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/base_bubble_controller.mm @@ -14,8 +14,6 @@ #import "chrome/browser/ui/cocoa/info_bubble_view.h" #import "chrome/browser/ui/cocoa/info_bubble_window.h" #import "chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h" -#include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" @interface BaseBubbleController (Private) - (void)registerForNotifications; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm index 40bcf90..50ab741f 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.mm @@ -13,7 +13,6 @@ #import "chrome/browser/ui/cocoa/nsview_additions.h" #import "chrome/browser/ui/cocoa/themed_window.h" #include "chrome/browser/ui/search/search_ui.h" -#include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #import "ui/base/cocoa/nsgraphics_context_additions.h" #include "ui/base/theme_provider.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm index f7a984b..01f3c65 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm @@ -10,7 +10,6 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" -#include "grit/theme_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm index e800e7c..f2afb56 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm @@ -13,7 +13,6 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "components/url_fixer/url_fixer.h" #include "components/user_prefs/user_prefs.h" -#include "ui/base/l10n/l10n_util.h" using bookmarks::BookmarkExpandedStateTracker; diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index 200b001..e77a880 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -56,8 +56,6 @@ #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_source.h" #include "content/public/browser/web_contents.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util_mac.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm index 190b039..33e884b 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.mm @@ -10,7 +10,6 @@ #import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" -#include "ui/base/resource/resource_bundle.h" namespace { static const int kExtraMarginBelowWhenExpirationEditable = 5; diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.mm b/chrome/browser/ui/cocoa/download/download_item_cell.mm index 76b5ebd..0d75b09 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.mm +++ b/chrome/browser/ui/cocoa/download/download_item_cell.mm @@ -16,7 +16,6 @@ #include "grit/theme_resources.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSColor+Luminance.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/gfx/text_elider.h" #include "ui/gfx/canvas_skia_paint.h" #include "ui/gfx/font_list.h" diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm index 51c70f7..d2bf53e 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm @@ -24,7 +24,6 @@ #include "content/public/browser/download_manager.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" #import "ui/base/cocoa/hover_button.h" -#include "ui/base/l10n/l10n_util.h" using content::DownloadItem; diff --git a/chrome/browser/ui/cocoa/download/download_shelf_view.mm b/chrome/browser/ui/cocoa/download/download_shelf_view.mm index 4ba5e0f..7923038 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_view.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_view.mm @@ -10,7 +10,6 @@ #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h" #import "chrome/browser/ui/cocoa/themed_window.h" #import "chrome/browser/ui/cocoa/view_id_util.h" -#include "grit/theme_resources.h" #import "ui/base/cocoa/nsgraphics_context_additions.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm index bf2cd9a..36ff600 100644 --- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm +++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm @@ -22,7 +22,6 @@ #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMNSAnimation+Duration.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia_paint.h" #include "ui/gfx/image/image.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm b/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm index 5c90592..93557cd 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm @@ -15,7 +15,6 @@ #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" #include "ui/base/l10n/l10n_util_mac.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia_util_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm index 67daee6..2e22a2c1 100644 --- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.mm @@ -18,7 +18,6 @@ #import "ui/base/cocoa/menu_controller.h" #import "ui/base/models/menu_model.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" // Controller for UI events on items in the media galleries dialog. @interface MediaGalleriesCocoaController : NSObject { diff --git a/chrome/browser/ui/cocoa/first_run_bubble_controller.mm b/chrome/browser/ui/cocoa/first_run_bubble_controller.mm index 03e6de8..85915c4 100644 --- a/chrome/browser/ui/cocoa/first_run_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/first_run_bubble_controller.mm @@ -12,7 +12,6 @@ #import "chrome/browser/ui/cocoa/info_bubble_view.h" #import "chrome/browser/ui/cocoa/l10n_util.h" #include "components/search_engines/util.h" -#include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" @interface FirstRunBubbleController(Private) diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm index f762862..6c6df54 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog.mm @@ -19,7 +19,6 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" #include "components/search_engines/template_url_service.h" -#include "grit/locale_settings.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util_mac.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm index f074c274..0658d69 100644 --- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm @@ -21,7 +21,6 @@ #include "chrome/browser/ui/global_error/global_error_service.h" #include "chrome/browser/ui/global_error/global_error_service_factory.h" #include "components/search_engines/util.h" -#include "grit/generated_resources.h" #import "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/cocoa/image_button_cell.mm b/chrome/browser/ui/cocoa/image_button_cell.mm index 35dede3..cefb4d3 100644 --- a/chrome/browser/ui/cocoa/image_button_cell.mm +++ b/chrome/browser/ui/cocoa/image_button_cell.mm @@ -9,7 +9,6 @@ #import "chrome/browser/ui/cocoa/nsview_additions.h" #import "chrome/browser/ui/cocoa/rect_path_utils.h" #import "chrome/browser/ui/cocoa/themed_window.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm index 34f2fc6..e43e54a 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm @@ -17,7 +17,6 @@ #import "third_party/mozilla/NSPasteboard+Utils.h" #import "ui/base/cocoa/appkit_utils.h" #import "ui/base/cocoa/tracking_area.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" using extensions::FeatureSwitch; diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm index e43811e..b392695 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell_unittest.mm @@ -15,13 +15,11 @@ #import "chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h" #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h" #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h" -#include "grit/theme_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" #import "third_party/ocmock/OCMock/OCMock.h" #include "third_party/ocmock/gtest_support.h" -#include "ui/base/resource/resource_bundle.h" using ::testing::Return; using ::testing::StrictMock; diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm index de11736..b95d675 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm @@ -19,7 +19,6 @@ #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" -#include "ui/base/resource/resource_bundle.h" using ::testing::A; using ::testing::InSequence; diff --git a/chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.mm b/chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.mm index 333afaa..504696b 100644 --- a/chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.mm @@ -6,7 +6,6 @@ #include "chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h" #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" -#include "grit/theme_resources.h" using autofill::GeneratedCreditCardBubbleController; diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm index 02e49fd..a4c4e92 100644 --- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm +++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm @@ -76,7 +76,6 @@ #include "skia/ext/skia_utils_mac.h" #import "ui/base/cocoa/cocoa_base_utils.h" #include "ui/base/l10n/l10n_util_mac.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" using content::WebContents; diff --git a/chrome/browser/ui/cocoa/location_bar/origin_chip_decoration.mm b/chrome/browser/ui/cocoa/location_bar/origin_chip_decoration.mm index f77bc47..96a79e3 100644 --- a/chrome/browser/ui/cocoa/location_bar/origin_chip_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/origin_chip_decoration.mm @@ -19,8 +19,6 @@ #include "content/public/browser/user_metrics.h" #include "extensions/browser/extension_icon_image.h" #include "grit/theme_resources.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" namespace { diff --git a/chrome/browser/ui/cocoa/location_bar/search_button_decoration.mm b/chrome/browser/ui/cocoa/location_bar/search_button_decoration.mm index aa1bbba..18785c2 100644 --- a/chrome/browser/ui/cocoa/location_bar/search_button_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/search_button_decoration.mm @@ -7,7 +7,6 @@ #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" #import "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h" #include "grit/theme_resources.h" -#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm index 8215bcc..6e1b27c 100644 --- a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm +++ b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm @@ -19,10 +19,8 @@ #include "components/password_manager/core/browser/password_manager.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "third_party/google_toolbox_for_mac/src/AppKit/GTMUILocalizerAndLayoutTweaker.h" -#include "ui/base/l10n/l10n_util.h" using autofill::PasswordForm; using content::BrowserThread; diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm index ff1d1d2..1ce4053 100644 --- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm +++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.mm @@ -23,7 +23,6 @@ #import "ui/base/cocoa/cocoa_base_utils.h" #import "ui/base/cocoa/flipped_view.h" #include "ui/base/cocoa/window_size_constants.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/rect.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" #include "ui/gfx/text_elider.h" diff --git a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm index d05be0a..ed47b09 100644 --- a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm +++ b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm @@ -22,7 +22,6 @@ #import "chrome/browser/ui/cocoa/profiles/profile_chooser_controller.h" #include "components/signin/core/browser/signin_error_controller.h" #include "components/signin/core/common/profile_management_switches.h" -#include "ui/base/resource/resource_bundle.h" // Space between the avatar icon and the avatar menu bubble. const CGFloat kMenuYOffsetAdjust = 1.0; diff --git a/chrome/browser/ui/cocoa/profiles/avatar_label_button.mm b/chrome/browser/ui/cocoa/profiles/avatar_label_button.mm index c3cd37d..b478c24 100644 --- a/chrome/browser/ui/cocoa/profiles/avatar_label_button.mm +++ b/chrome/browser/ui/cocoa/profiles/avatar_label_button.mm @@ -10,7 +10,6 @@ #include "grit/theme_resources.h" #include "ui/base/cocoa/appkit_utils.h" #include "ui/base/l10n/l10n_util_mac.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" namespace { diff --git a/chrome/browser/ui/cocoa/profiles/avatar_label_button_unittest.mm b/chrome/browser/ui/cocoa/profiles/avatar_label_button_unittest.mm index 536bacf..a115695 100644 --- a/chrome/browser/ui/cocoa/profiles/avatar_label_button_unittest.mm +++ b/chrome/browser/ui/cocoa/profiles/avatar_label_button_unittest.mm @@ -7,7 +7,6 @@ #include "base/mac/scoped_nsobject.h" #import "chrome/browser/ui/cocoa/profiles/avatar_label_button.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" -#include "grit/theme_resources.h" #include "testing/gtest/include/gtest/gtest.h" class AvatarLabelButtonTest : public CocoaTest { diff --git a/chrome/browser/ui/cocoa/styled_text_field_cell.mm b/chrome/browser/ui/cocoa/styled_text_field_cell.mm index c1f53b2..9b883ab 100644 --- a/chrome/browser/ui/cocoa/styled_text_field_cell.mm +++ b/chrome/browser/ui/cocoa/styled_text_field_cell.mm @@ -11,7 +11,6 @@ #import "chrome/browser/ui/cocoa/themed_window.h" #include "grit/theme_resources.h" #import "ui/base/cocoa/nsgraphics_context_additions.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font.h" #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_controller.mm index 390d7f8..eb62a07 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_controller.mm @@ -18,7 +18,6 @@ #import "chrome/browser/ui/cocoa/tabs/tab_view.h" #import "chrome/browser/ui/cocoa/themed_window.h" #import "extensions/common/extension.h" -#include "grit/generated_resources.h" #import "ui/base/cocoa/menu_controller.h" @implementation TabController diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index 3ab3254..67b10c6 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -56,7 +56,6 @@ #import "ui/base/cocoa/menu_controller.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/l10n/l10n_util_mac.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/ui/cocoa/website_settings/split_block_button.h b/chrome/browser/ui/cocoa/website_settings/split_block_button.h index ddb3287..fa723cd 100644 --- a/chrome/browser/ui/cocoa/website_settings/split_block_button.h +++ b/chrome/browser/ui/cocoa/website_settings/split_block_button.h @@ -8,7 +8,6 @@ #import <Cocoa/Cocoa.h> #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_button.h" -#include "grit/generated_resources.h" #include "ui/base/models/simple_menu_model.h" @class SplitButtonPopUpCell; diff --git a/chrome/browser/ui/cocoa/website_settings/split_block_button.mm b/chrome/browser/ui/cocoa/website_settings/split_block_button.mm index b57a59c..a0d8541 100644 --- a/chrome/browser/ui/cocoa/website_settings/split_block_button.mm +++ b/chrome/browser/ui/cocoa/website_settings/split_block_button.mm @@ -8,6 +8,7 @@ #include "base/logging.h" #include "base/mac/scoped_nsobject.h" +#include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" #import "ui/base/cocoa/menu_controller.h" #include "ui/base/l10n/l10n_util_mac.h" diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc index e6470bb..d25a019 100644 --- a/chrome/browser/ui/extensions/application_launch.cc +++ b/chrome/browser/ui/extensions/application_launch.cc @@ -41,7 +41,6 @@ #include "extensions/common/extension.h" #include "extensions/common/features/feature.h" #include "extensions/common/features/feature_provider.h" -#include "grit/generated_resources.h" #include "ui/base/window_open_disposition.h" #include "ui/gfx/rect.h" diff --git a/chrome/browser/ui/extensions/extension_install_ui_default.cc b/chrome/browser/ui/extensions/extension_install_ui_default.cc index 0a19f7b..416f900 100644 --- a/chrome/browser/ui/extensions/extension_install_ui_default.cc +++ b/chrome/browser/ui/extensions/extension_install_ui_default.cc @@ -38,7 +38,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #if defined(USE_ASH) #include "ash/shell.h" diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc index c27f81f..4523c45 100644 --- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc +++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc @@ -79,7 +79,6 @@ #include "net/url_request/url_request_status.h" #include "testing/gmock/include/gmock/gmock.h" #include "third_party/skia/include/core/SkBitmap.h" -#include "ui/base/l10n/l10n_util.h" using base::ASCIIToUTF16; using testing::HasSubstr; diff --git a/chrome/browser/ui/search/search_ui.cc b/chrome/browser/ui/search/search_ui.cc index 7644f62..d69483d 100644 --- a/chrome/browser/ui/search/search_ui.cc +++ b/chrome/browser/ui/search/search_ui.cc @@ -6,7 +6,6 @@ #include "chrome/browser/themes/theme_properties.h" #include "chrome/browser/themes/theme_service.h" -#include "grit/theme_resources.h" namespace chrome { diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc index e7cd859..fd046f8 100644 --- a/chrome/browser/ui/startup/startup_browser_creator.cc +++ b/chrome/browser/ui/startup/startup_browser_creator.cc @@ -63,10 +63,7 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/child_process_security_policy.h" #include "content/public/browser/navigation_controller.h" -#include "grit/locale_settings.h" #include "net/base/net_util.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #if defined(USE_ASH) #include "ash/shell.h" diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc index 723f3fa..b8b1d1b 100644 --- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc +++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc @@ -93,7 +93,6 @@ #include "extensions/common/extension_set.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #if defined(OS_MACOSX) #include "base/mac/mac_util.h" diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc index 9f74224..4c02019 100644 --- a/chrome/browser/ui/sync/one_click_signin_helper.cc +++ b/chrome/browser/ui/sync/one_click_signin_helper.cc @@ -87,7 +87,6 @@ #include "net/cookies/cookie_monster.h" #include "net/url_request/url_request.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #include "url/gurl.h" diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc index eef6c52..157d23b4 100644 --- a/chrome/browser/ui/sync/one_click_signin_sync_starter.cc +++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.cc @@ -45,7 +45,6 @@ #include "grit/generated_resources.h" #include "net/url_request/url_request_context_getter.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc index fdc3d3e..cd8a320 100644 --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc @@ -26,7 +26,6 @@ #include "chrome/test/base/testing_profile.h" #include "components/sessions/serialized_navigation_entry_test_helper.h" #include "content/public/browser/browser_thread.h" -#include "grit/generated_resources.h" #include "sync/api/fake_sync_change_processor.h" #include "sync/api/sync_error_factory_mock.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc index 554dbdb..abc57b0 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model_unittest.cc @@ -18,7 +18,6 @@ #include "chrome/test/base/testing_io_thread_state.h" #include "chrome/test/base/testing_pref_service_syncable.h" #include "chrome/test/base/testing_profile.h" -#include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" namespace { diff --git a/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc b/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc index 8c6b069..828d87b 100644 --- a/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc +++ b/chrome/browser/ui/views/apps/app_window_desktop_window_tree_host_win.cc @@ -8,7 +8,6 @@ #include "chrome/browser/ui/views/apps/chrome_native_app_window_views_win.h" #include "chrome/browser/ui/views/apps/glass_app_window_frame_view_win.h" -#include "grit/theme_resources.h" #include "ui/base/theme_provider.h" #include "ui/gfx/win/dpi.h" #include "ui/views/controls/menu/native_menu_win.h" diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc index d30d6c8..bc344b3 100644 --- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc +++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc @@ -28,7 +28,6 @@ #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/combobox_model.h" #include "ui/base/models/menu_model.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc b/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc index 99a8f03..522c162 100644 --- a/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc +++ b/chrome/browser/ui/views/autofill/autofill_popup_view_views.cc @@ -6,7 +6,6 @@ #include "chrome/browser/ui/autofill/autofill_popup_controller.h" #include "components/autofill/core/browser/popup_item_ids.h" -#include "grit/ui_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/canvas.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc index fb2c2a9..eb719d7 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc @@ -33,7 +33,6 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/page_navigator.h" #include "content/public/test/test_browser_thread.h" -#include "grit/generated_resources.h" #include "ui/aura/env.h" #include "ui/aura/env_observer.h" #include "ui/aura/window.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc index 8dc194c..12e6ddf 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu.cc @@ -10,8 +10,6 @@ #include "chrome/browser/chrome_notification_types.h" #include "components/bookmarks/browser/bookmark_model.h" #include "content/public/browser/notification_service.h" -#include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_model_adapter.h" #include "ui/views/controls/menu/menu_runner.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc index 77b4e27..4250c80 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc @@ -25,7 +25,6 @@ #include "components/bookmarks/test/bookmark_test_helpers.h" #include "content/public/browser/page_navigator.h" #include "content/public/test/test_browser_thread.h" -#include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/clipboard/clipboard.h" #include "ui/events/platform/platform_event_source.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc index ddedbff..9bc48f3 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_controller_views.cc @@ -15,11 +15,7 @@ #include "components/bookmarks/browser/bookmark_model.h" #include "content/public/browser/page_navigator.h" #include "content/public/browser/user_metrics.h" -#include "grit/generated_resources.h" -#include "grit/theme_resources.h" -#include "grit/ui_resources.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/button/menu_button.h" #include "ui/views/controls/menu/menu_item_view.h" #include "ui/views/controls/menu/menu_runner.h" diff --git a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc index c50d2f1..68b0f32 100644 --- a/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc +++ b/chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.cc @@ -24,7 +24,6 @@ #include "grit/theme_resources.h" #include "grit/ui_resources.h" #include "ui/base/dragdrop/os_exchange_data.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/window_open_disposition.h" #include "ui/views/controls/button/menu_button.h" diff --git a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc index 6027ad2..df00ec3 100644 --- a/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc +++ b/chrome/browser/ui/views/download/download_in_progress_dialog_view.cc @@ -12,7 +12,6 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/size.h" #include "ui/views/border.h" #include "ui/views/controls/message_box_view.h" diff --git a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc index 6f255a2..c50739f 100644 --- a/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc +++ b/chrome/browser/ui/views/frame/browser_desktop_window_tree_host_win.cc @@ -16,7 +16,6 @@ #include "chrome/browser/ui/views/frame/system_menu_insertion_delegate_win.h" #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/browser/ui/views/theme_image_mapper.h" -#include "grit/theme_resources.h" #include "ui/base/theme_provider.h" #include "ui/gfx/win/dpi.h" #include "ui/views/controls/menu/native_menu_win.h" diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc index e3bdb56..041e4dd 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view.cc @@ -21,7 +21,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkColor.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc index 1089441..885453f 100644 --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc @@ -31,7 +31,6 @@ #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/base/hit_test.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" diff --git a/chrome/browser/ui/views/frame/browser_view_unittest.cc b/chrome/browser/ui/views/frame/browser_view_unittest.cc index ded2626..73f3e73 100644 --- a/chrome/browser/ui/views/frame/browser_view_unittest.cc +++ b/chrome/browser/ui/views/frame/browser_view_unittest.cc @@ -14,9 +14,6 @@ #include "chrome/browser/ui/views/tabs/tab_strip.h" #include "chrome/browser/ui/views/toolbar/toolbar_view.h" #include "chrome/common/url_constants.h" -#include "grit/generated_resources.h" -#include "grit/theme_resources.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/single_split_view.h" #include "ui/views/controls/webview/webview.h" diff --git a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc index 8ef74b6..d251f4f 100644 --- a/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc +++ b/chrome/browser/ui/views/frame/desktop_browser_frame_aura.cc @@ -8,14 +8,11 @@ #include "chrome/browser/ui/views/frame/browser_desktop_window_tree_host.h" #include "chrome/browser/ui/views/frame/browser_shutdown.h" #include "chrome/browser/ui/views/frame/browser_view.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/window.h" #include "ui/aura/window_event_dispatcher.h" #include "ui/aura/window_observer.h" #include "ui/base/hit_test.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/gfx/font.h" #include "ui/views/view.h" diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc index 8d651d8..f0c4c26 100644 --- a/chrome/browser/ui/views/frame/glass_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.cc @@ -24,7 +24,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "grit/ui_resources.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle_win.h" #include "ui/base/theme_provider.h" #include "ui/gfx/canvas.h" diff --git a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc index c222ba9..490b6be 100644 --- a/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc +++ b/chrome/browser/ui/views/location_bar/icon_label_bubble_view.cc @@ -6,7 +6,6 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" -#include "grit/theme_resources.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" #include "ui/gfx/color_utils.h" diff --git a/chrome/browser/ui/views/location_bar/origin_chip_view.cc b/chrome/browser/ui/views/location_bar/origin_chip_view.cc index a7c3596..bddd5cf 100644 --- a/chrome/browser/ui/views/location_bar/origin_chip_view.cc +++ b/chrome/browser/ui/views/location_bar/origin_chip_view.cc @@ -33,7 +33,6 @@ #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/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "ui/gfx/canvas.h" diff --git a/chrome/browser/ui/views/message_center/web_notification_tray_win.cc b/chrome/browser/ui/views/message_center/web_notification_tray_win.cc index 72d9f30..860b338 100644 --- a/chrome/browser/ui/views/message_center/web_notification_tray_win.cc +++ b/chrome/browser/ui/views/message_center/web_notification_tray_win.cc @@ -17,7 +17,6 @@ #include "grit/chromium_strings.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" namespace message_center { diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc index 5442100..8f46c64 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc @@ -44,7 +44,6 @@ #include "ui/base/ime/text_input_type.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" #include "ui/events/event.h" #include "ui/gfx/canvas.h" diff --git a/chrome/browser/ui/views/open_pdf_in_reader_bubble_view.cc b/chrome/browser/ui/views/open_pdf_in_reader_bubble_view.cc index 32cf698..e72bb1c 100644 --- a/chrome/browser/ui/views/open_pdf_in_reader_bubble_view.cc +++ b/chrome/browser/ui/views/open_pdf_in_reader_bubble_view.cc @@ -5,8 +5,6 @@ #include "chrome/browser/ui/views/open_pdf_in_reader_bubble_view.h" #include "chrome/browser/ui/pdf/open_pdf_in_reader_prompt_delegate.h" -#include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" diff --git a/chrome/browser/ui/views/profiles/avatar_menu_button_browsertest.cc b/chrome/browser/ui/views/profiles/avatar_menu_button_browsertest.cc index 1832a55..0e81ec6 100644 --- a/chrome/browser/ui/views/profiles/avatar_menu_button_browsertest.cc +++ b/chrome/browser/ui/views/profiles/avatar_menu_button_browsertest.cc @@ -17,7 +17,6 @@ #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/test_switches.h" #include "chrome/test/base/testing_browser_process.h" -#include "grit/generated_resources.h" class AvatarMenuButtonTest : public InProcessBrowserTest { public: diff --git a/chrome/browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc b/chrome/browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc index 3dd4f51..027c321 100644 --- a/chrome/browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc +++ b/chrome/browser/ui/views/profiles/new_avatar_menu_button_browsertest.cc @@ -22,7 +22,6 @@ #include "chrome/test/base/testing_browser_process.h" #include "components/signin/core/common/profile_management_switches.h" #include "content/public/test/test_utils.h" -#include "grit/generated_resources.h" #include "ui/views/controls/button/label_button.h" class NewAvatarMenuButtonTest : public InProcessBrowserTest { diff --git a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc index 7378989..1b762e3 100644 --- a/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc +++ b/chrome/browser/ui/views/profiles/profile_chooser_view_browsertest.cc @@ -28,7 +28,6 @@ #include "chrome/test/base/uma_histogram_helper.h" #include "components/signin/core/common/profile_management_switches.h" #include "content/public/test/test_utils.h" -#include "grit/generated_resources.h" #include "ui/views/controls/button/label_button.h" class ProfileChooserViewBrowserTest : public InProcessBrowserTest { diff --git a/chrome/browser/ui/views/session_crashed_bubble_view.cc b/chrome/browser/ui/views/session_crashed_bubble_view.cc index 212bf93..763ce8a 100644 --- a/chrome/browser/ui/views/session_crashed_bubble_view.cc +++ b/chrome/browser/ui/views/session_crashed_bubble_view.cc @@ -36,7 +36,6 @@ #include "grit/google_chrome_strings.h" #include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/views/bubble/bubble_frame_view.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/button/label_button.h" diff --git a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc index c5a8909..33960e7 100644 --- a/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc +++ b/chrome/browser/ui/views/tab_modal_confirm_dialog_views.cc @@ -11,8 +11,6 @@ #include "chrome/browser/ui/views/constrained_window_views.h" #include "chrome/common/chrome_switches.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/window_open_disposition.h" #include "ui/views/controls/message_box_view.h" #include "ui/views/layout/layout_constants.h" diff --git a/chrome/browser/ui/views/translate/translate_bubble_view.cc b/chrome/browser/ui/views/translate/translate_bubble_view.cc index 5d622aa..4194d21 100644 --- a/chrome/browser/ui/views/translate/translate_bubble_view.cc +++ b/chrome/browser/ui/views/translate/translate_bubble_view.cc @@ -28,7 +28,6 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/combobox_model.h" #include "ui/base/models/simple_combobox_model.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/views/controls/button/checkbox.h" #include "ui/views/controls/button/label_button.h" #include "ui/views/controls/combobox/combobox.h" diff --git a/chrome/browser/ui/website_settings/website_settings.cc b/chrome/browser/ui/website_settings/website_settings.cc index 3390535..f93484c 100644 --- a/chrome/browser/ui/website_settings/website_settings.cc +++ b/chrome/browser/ui/website_settings/website_settings.cc @@ -44,7 +44,6 @@ #include "net/ssl/ssl_cipher_suite_names.h" #include "net/ssl/ssl_connection_status_flags.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/policy/policy_cert_service.h" diff --git a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc index 7a22c58..e1467f7 100644 --- a/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc +++ b/chrome/browser/ui/webui/chromeos/choose_mobile_network_ui.cc @@ -28,8 +28,6 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "third_party/cros_system_api/dbus/service_constants.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" using content::WebContents; using content::WebUIMessageHandler; diff --git a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc index 5376676..a4d9b6a 100644 --- a/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc +++ b/chrome/browser/ui/webui/chromeos/keyboard_overlay_ui.cc @@ -28,8 +28,6 @@ #include "grit/browser_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" using chromeos::input_method::ModifierKey; using content::WebUIMessageHandler; diff --git a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc index 62aa6e0..5204aa2 100644 --- a/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc +++ b/chrome/browser/ui/webui/chromeos/login/reset_screen_handler.cc @@ -25,7 +25,6 @@ #include "grit/browser_resources.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc b/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc index e898fac..d45511a 100644 --- a/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc +++ b/chrome/browser/ui/webui/chromeos/slow_trace_ui.cc @@ -13,8 +13,6 @@ #include "components/feedback/tracing_manager.h" #include "content/public/browser/url_data_source.h" #include "content/public/browser/web_ui.h" -#include "grit/theme_resources.h" -#include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/ui/webui/chromeos/slow_ui.cc b/chrome/browser/ui/webui/chromeos/slow_ui.cc index 71161db..151afee 100644 --- a/chrome/browser/ui/webui/chromeos/slow_ui.cc +++ b/chrome/browser/ui/webui/chromeos/slow_ui.cc @@ -19,8 +19,6 @@ #include "content/public/browser/web_ui_message_handler.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" #include "ui/base/webui/web_ui_util.h" diff --git a/chrome/browser/ui/webui/crashes_ui.cc b/chrome/browser/ui/webui/crashes_ui.cc index 54a7d95..4db7a7d 100644 --- a/chrome/browser/ui/webui/crashes_ui.cc +++ b/chrome/browser/ui/webui/crashes_ui.cc @@ -25,7 +25,6 @@ #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" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/ui/webui/downloads_dom_handler.cc b/chrome/browser/ui/webui/downloads_dom_handler.cc index e917015..f347ba3 100644 --- a/chrome/browser/ui/webui/downloads_dom_handler.cc +++ b/chrome/browser/ui/webui/downloads_dom_handler.cc @@ -45,7 +45,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" #include "extensions/browser/extension_system.h" -#include "grit/generated_resources.h" #include "net/base/filename_util.h" #include "ui/base/l10n/time_format.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc index fa03605..e8c5110 100644 --- a/chrome/browser/ui/webui/extensions/extension_settings_handler.cc +++ b/chrome/browser/ui/webui/extensions/extension_settings_handler.cc @@ -96,7 +96,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" using base::DictionaryValue; using base::ListValue; diff --git a/chrome/browser/ui/webui/fileicon_source.cc b/chrome/browser/ui/webui/fileicon_source.cc index e545e2f..bfdb95c 100644 --- a/chrome/browser/ui/webui/fileicon_source.cc +++ b/chrome/browser/ui/webui/fileicon_source.cc @@ -13,7 +13,6 @@ #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "grit/generated_resources.h" #include "net/base/escape.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/webui/web_ui_util.h" diff --git a/chrome/browser/ui/webui/flash_ui.cc b/chrome/browser/ui/webui/flash_ui.cc index 58b6c6b..eecb1be 100644 --- a/chrome/browser/ui/webui/flash_ui.cc +++ b/chrome/browser/ui/webui/flash_ui.cc @@ -41,7 +41,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) #include "base/win/windows_version.h" diff --git a/chrome/browser/ui/webui/help/help_handler.cc b/chrome/browser/ui/webui/help/help_handler.cc index 6c7b8ae..5b5041e 100644 --- a/chrome/browser/ui/webui/help/help_handler.cc +++ b/chrome/browser/ui/webui/help/help_handler.cc @@ -34,7 +34,6 @@ #include "grit/generated_resources.h" #include "grit/google_chrome_strings.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #include "v8/include/v8.h" #if defined(OS_MACOSX) @@ -54,7 +53,6 @@ #include "chromeos/chromeos_switches.h" #include "chromeos/dbus/dbus_thread_manager.h" #include "chromeos/dbus/power_manager_client.h" -#include "content/public/browser/browser_thread.h" #endif using base::ListValue; diff --git a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc index a8e1f8d..ea3d50c 100644 --- a/chrome/browser/ui/webui/interstitials/interstitial_ui.cc +++ b/chrome/browser/ui/webui/interstitials/interstitial_ui.cc @@ -16,7 +16,6 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_controller.h" #include "content/public/browser/web_ui_data_source.h" -#include "grit/browser_resources.h" #include "net/base/net_errors.h" #include "net/base/url_util.h" #include "net/cert/x509_certificate.h" diff --git a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc index 10d68a7..b1a9004 100644 --- a/chrome/browser/ui/webui/media/webrtc_logs_ui.cc +++ b/chrome/browser/ui/webui/media/webrtc_logs_ui.cc @@ -29,8 +29,6 @@ #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" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/settings/cros_settings.h" diff --git a/chrome/browser/ui/webui/nacl_ui.cc b/chrome/browser/ui/webui/nacl_ui.cc index 6bfd575..8c2a135 100644 --- a/chrome/browser/ui/webui/nacl_ui.cc +++ b/chrome/browser/ui/webui/nacl_ui.cc @@ -37,7 +37,6 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) #include "base/win/windows_version.h" diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc index 151870b..1a4f239 100644 --- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc +++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc @@ -70,7 +70,6 @@ #include "net/proxy/proxy_service.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" -#include "ui/base/resource/resource_bundle.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/file_manager/filesystem_api_util.h" diff --git a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc index 177a660..e5602fe 100644 --- a/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc +++ b/chrome/browser/ui/webui/ntp/favicon_webui_handler.cc @@ -18,7 +18,6 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/web_ui.h" #include "extensions/browser/extension_registry.h" -#include "grit/ui_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/ui/webui/ntp/most_visited_handler.cc b/chrome/browser/ui/webui/ntp/most_visited_handler.cc index bdaf321..4174df4 100644 --- a/chrome/browser/ui/webui/ntp/most_visited_handler.cc +++ b/chrome/browser/ui/webui/ntp/most_visited_handler.cc @@ -42,10 +42,6 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_ui.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" -#include "grit/locale_settings.h" -#include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" using base::UserMetricsAction; diff --git a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc index 2c0099f..e3131ce 100644 --- a/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc +++ b/chrome/browser/ui/webui/ntp/new_tab_page_handler.cc @@ -17,9 +17,6 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_ui.h" -#include "grit/chromium_strings.h" -#include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/webui/ntp/thumbnail_source.cc b/chrome/browser/ui/webui/ntp/thumbnail_source.cc index b2ad802..64d6f96 100644 --- a/chrome/browser/ui/webui/ntp/thumbnail_source.cc +++ b/chrome/browser/ui/webui/ntp/thumbnail_source.cc @@ -12,9 +12,7 @@ #include "chrome/browser/thumbnails/thumbnail_service.h" #include "chrome/browser/thumbnails/thumbnail_service_factory.h" #include "chrome/common/url_constants.h" -#include "grit/theme_resources.h" #include "net/url_request/url_request.h" -#include "ui/base/resource/resource_bundle.h" #include "url/gurl.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc index beb4d44..58e9186 100644 --- a/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc @@ -18,7 +18,6 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "third_party/cros_system_api/dbus/service_constants.h" -#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc index 02801fa..747cc12 100644 --- a/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc +++ b/chrome/browser/ui/webui/options/chromeos/proxy_handler.cc @@ -19,7 +19,6 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" namespace chromeos { namespace options { diff --git a/chrome/browser/ui/webui/options/cookies_view_handler.cc b/chrome/browser/ui/webui/options/cookies_view_handler.cc index 1012ef3..179ea03 100644 --- a/chrome/browser/ui/webui/options/cookies_view_handler.cc +++ b/chrome/browser/ui/webui/options/cookies_view_handler.cc @@ -27,7 +27,6 @@ #include "content/public/browser/storage_partition.h" #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" namespace fileapi { class FileSystemContext; diff --git a/chrome/browser/ui/webui/options/handler_options_handler.cc b/chrome/browser/ui/webui/options/handler_options_handler.cc index 92b9c71..79ba027 100644 --- a/chrome/browser/ui/webui/options/handler_options_handler.cc +++ b/chrome/browser/ui/webui/options/handler_options_handler.cc @@ -17,7 +17,6 @@ #include "components/google/core/browser/google_util.h" #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" namespace options { diff --git a/chrome/browser/ui/webui/options/home_page_overlay_handler.cc b/chrome/browser/ui/webui/options/home_page_overlay_handler.cc index 1328f86..0fe3cd2 100644 --- a/chrome/browser/ui/webui/options/home_page_overlay_handler.cc +++ b/chrome/browser/ui/webui/options/home_page_overlay_handler.cc @@ -17,7 +17,6 @@ #include "components/omnibox/autocomplete_input.h" #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" namespace options { diff --git a/chrome/browser/ui/webui/options/import_data_handler.cc b/chrome/browser/ui/webui/options/import_data_handler.cc index d8e8fe6..5b38dc0 100644 --- a/chrome/browser/ui/webui/options/import_data_handler.cc +++ b/chrome/browser/ui/webui/options/import_data_handler.cc @@ -28,7 +28,6 @@ #include "content/public/browser/web_ui.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" using content::BrowserThread; diff --git a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc index 45897f6..a758ec7 100644 --- a/chrome/browser/ui/webui/options/media_devices_selection_handler.cc +++ b/chrome/browser/ui/webui/options/media_devices_selection_handler.cc @@ -8,6 +8,7 @@ #include "base/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" +#include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/ui/webui/options/media_devices_selection_handler.h b/chrome/browser/ui/webui/options/media_devices_selection_handler.h index e060872..7e1ab3b 100644 --- a/chrome/browser/ui/webui/options/media_devices_selection_handler.h +++ b/chrome/browser/ui/webui/options/media_devices_selection_handler.h @@ -8,7 +8,6 @@ #include "chrome/browser/media/media_capture_devices_dispatcher.h" #include "chrome/browser/ui/webui/options/options_ui.h" #include "content/public/browser/web_contents.h" -#include "grit/generated_resources.h" namespace options { diff --git a/chrome/browser/ui/webui/options/password_manager_handler.cc b/chrome/browser/ui/webui/options/password_manager_handler.cc index 9ad56cd..d5a6580 100644 --- a/chrome/browser/ui/webui/options/password_manager_handler.cc +++ b/chrome/browser/ui/webui/options/password_manager_handler.cc @@ -25,7 +25,6 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" -#include "ui/base/l10n/l10n_util.h" namespace options { diff --git a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc index bd3b8d2..69afc31 100644 --- a/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc +++ b/chrome/browser/ui/webui/options/reset_profile_settings_handler.cc @@ -21,7 +21,6 @@ #include "content/public/browser/user_metrics.h" #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" namespace options { diff --git a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc index 23a6d97..4f039b4 100644 --- a/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc +++ b/chrome/browser/ui/webui/options/supervised_user_create_confirm_handler.cc @@ -20,7 +20,6 @@ #include "components/signin/core/browser/signin_manager_base.h" #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" namespace options { diff --git a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc index 53b65b8..2e7e63c 100644 --- a/chrome/browser/ui/webui/options/supervised_user_import_handler.cc +++ b/chrome/browser/ui/webui/options/supervised_user_import_handler.cc @@ -29,7 +29,6 @@ #include "content/public/browser/web_ui.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/webui/quota_internals/quota_internals_ui.cc b/chrome/browser/ui/webui/quota_internals/quota_internals_ui.cc index 090deac..44e7707 100644 --- a/chrome/browser/ui/webui/quota_internals/quota_internals_ui.cc +++ b/chrome/browser/ui/webui/quota_internals/quota_internals_ui.cc @@ -13,8 +13,6 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "grit/quota_internals_resources.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" using content::WebContents; diff --git a/chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.cc b/chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.cc index 51ed4ba3..e060c01 100644 --- a/chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.cc +++ b/chrome/browser/ui/webui/signin/profile_signin_confirmation_ui.cc @@ -13,8 +13,6 @@ #include "grit/browser_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" ProfileSigninConfirmationUI::ProfileSigninConfirmationUI(content::WebUI* web_ui) : ConstrainedWebDialogUI(web_ui) { diff --git a/chrome/browser/ui/webui/signin_internals_ui.cc b/chrome/browser/ui/webui/signin_internals_ui.cc index f615427..e4802b5 100644 --- a/chrome/browser/ui/webui/signin_internals_ui.cc +++ b/chrome/browser/ui/webui/signin_internals_ui.cc @@ -12,7 +12,6 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "grit/signin_internals_resources.h" -#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc index 9573f87..6daeeaf 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/extension_statuses_handler.cc @@ -18,7 +18,6 @@ #include "content/public/browser/web_ui_data_source.h" #include "extensions/browser/extension_system.h" #include "extensions/common/extension.h" -#include "grit/sync_file_system_internals_resources.h" using sync_file_system::SyncFileSystemServiceFactory; using sync_file_system::SyncServiceState; diff --git a/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc b/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc index 1587c04..d4cfb9d 100644 --- a/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc +++ b/chrome/browser/ui/webui/sync_file_system_internals/file_metadata_handler.cc @@ -17,7 +17,6 @@ #include "content/public/browser/web_ui.h" #include "content/public/browser/web_ui_data_source.h" #include "extensions/common/extension.h" -#include "grit/sync_file_system_internals_resources.h" using sync_file_system::RemoteFileSyncService; using sync_file_system::SyncFileSystemServiceFactory; diff --git a/chrome/browser/ui/webui/sync_internals_ui.cc b/chrome/browser/ui/webui/sync_internals_ui.cc index bc38b6e..e7ec282 100644 --- a/chrome/browser/ui/webui/sync_internals_ui.cc +++ b/chrome/browser/ui/webui/sync_internals_ui.cc @@ -11,7 +11,6 @@ #include "content/public/browser/web_ui_data_source.h" #include "extensions/common/extension_messages.h" #include "grit/sync_internals_resources.h" -#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc index 8fc18c8..da403f8 100644 --- a/chrome/browser/ui/webui/sync_setup_handler_unittest.cc +++ b/chrome/browser/ui/webui/sync_setup_handler_unittest.cc @@ -31,9 +31,7 @@ #include "content/public/browser/web_ui.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/gtest/include/gtest/gtest.h" -#include "ui/base/l10n/l10n_util.h" #include "ui/base/layout.h" using ::testing::_; diff --git a/chrome/browser/ui/webui/translate_internals/translate_internals_ui.cc b/chrome/browser/ui/webui/translate_internals/translate_internals_ui.cc index 0a13ad3..ee3ad10 100644 --- a/chrome/browser/ui/webui/translate_internals/translate_internals_ui.cc +++ b/chrome/browser/ui/webui/translate_internals/translate_internals_ui.cc @@ -22,7 +22,6 @@ #include "grit/browser_resources.h" #include "grit/translate_internals_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/undo/bookmark_undo_service.cc b/chrome/browser/undo/bookmark_undo_service.cc index b54eb02..b010d14 100644 --- a/chrome/browser/undo/bookmark_undo_service.cc +++ b/chrome/browser/undo/bookmark_undo_service.cc @@ -14,7 +14,6 @@ #include "components/bookmarks/browser/bookmark_utils.h" #include "components/bookmarks/browser/scoped_group_bookmark_actions.h" #include "grit/generated_resources.h" -#include "ui/base/l10n/l10n_util.h" using bookmarks::BookmarkNodeData; diff --git a/chrome/browser/upgrade_detector_impl.cc b/chrome/browser/upgrade_detector_impl.cc index ec0f8d0..f0e854c 100644 --- a/chrome/browser/upgrade_detector_impl.cc +++ b/chrome/browser/upgrade_detector_impl.cc @@ -27,7 +27,6 @@ #include "chrome/common/pref_names.h" #include "components/network_time/network_time_tracker.h" #include "content/public/browser/browser_thread.h" -#include "ui/base/resource/resource_bundle.h" #if defined(OS_WIN) #include "base/win/win_util.h" diff --git a/chrome/common/chrome_version_info.cc b/chrome/common/chrome_version_info.cc index 5daa6d1..c70bf9a 100644 --- a/chrome/common/chrome_version_info.cc +++ b/chrome/common/chrome_version_info.cc @@ -12,7 +12,6 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" namespace chrome { diff --git a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc index 6ea7171..55b3247 100644 --- a/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc +++ b/chrome/common/extensions/manifest_handlers/settings_overrides_handler.cc @@ -18,10 +18,8 @@ #include "extensions/common/permissions/manifest_permission.h" #include "extensions/common/permissions/permissions_info.h" #include "extensions/common/permissions/settings_override_permission.h" -#include "grit/generated_resources.h" #include "ipc/ipc_message.h" #include "ipc/ipc_message_utils.h" -#include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" using extensions::api::manifest_types::ChromeSettingsOverrides; diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc index e0a87e2..8b9c685 100644 --- a/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc +++ b/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/strings/string_util.h" #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" #include "chrome/common/extensions/manifest_url_handler.h" #include "extensions/common/extension.h" #include "extensions/common/manifest_constants.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/base/l10n/l10n_util.h" namespace errors = extensions::manifest_errors; diff --git a/chrome/renderer/extensions/extension_localization_peer.cc b/chrome/renderer/extensions/extension_localization_peer.cc index 7373995a..ec93caf 100644 --- a/chrome/renderer/extensions/extension_localization_peer.cc +++ b/chrome/renderer/extensions/extension_localization_peer.cc @@ -10,7 +10,6 @@ #include "extensions/common/constants.h" #include "extensions/common/extension_messages.h" #include "extensions/common/message_bundle.h" -#include "grit/generated_resources.h" #include "ipc/ipc_sender.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" diff --git a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc index 0cba711..de488f4 100644 --- a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc +++ b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc @@ -21,7 +21,6 @@ #include "chrome/renderer/safe_browsing/features.h" #include "chrome/renderer/safe_browsing/murmurhash3_util.h" #include "crypto/sha2.h" -#include "ui/base/l10n/l10n_util.h" namespace safe_browsing { diff --git a/chrome/renderer/searchbox/searchbox.cc b/chrome/renderer/searchbox/searchbox.cc index 4adb387..7c898c5 100644 --- a/chrome/renderer/searchbox/searchbox.cc +++ b/chrome/renderer/searchbox/searchbox.cc @@ -17,12 +17,10 @@ #include "chrome/renderer/searchbox/searchbox_extension.h" #include "components/favicon_base/favicon_types.h" #include "content/public/renderer/render_view.h" -#include "grit/renderer_resources.h" #include "net/base/escape.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebView.h" -#include "ui/base/resource/resource_bundle.h" #include "url/gurl.h" namespace { diff --git a/chrome/renderer/spellchecker/spellcheck_unittest.cc b/chrome/renderer/spellchecker/spellcheck_unittest.cc index 68ff023..50ad9b4 100644 --- a/chrome/renderer/spellchecker/spellcheck_unittest.cc +++ b/chrome/renderer/spellchecker/spellcheck_unittest.cc @@ -15,7 +15,6 @@ #include "testing/gtest/include/gtest/gtest.h" #include "third_party/WebKit/public/web/WebTextCheckingCompletion.h" #include "third_party/WebKit/public/web/WebTextCheckingResult.h" -#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/renderer/web_apps.cc b/chrome/renderer/web_apps.cc index 736015b..2c9801e 100644 --- a/chrome/renderer/web_apps.cc +++ b/chrome/renderer/web_apps.cc @@ -12,12 +12,11 @@ #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_split.h" +#include "base/strings/string_util.h" #include "base/strings/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/web_application_info.h" -#include "grit/common_resources.h" -#include "grit/generated_resources.h" #include "third_party/WebKit/public/platform/WebString.h" #include "third_party/WebKit/public/platform/WebURL.h" #include "third_party/WebKit/public/web/WebDocument.h" @@ -25,8 +24,6 @@ #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebNode.h" #include "third_party/WebKit/public/web/WebNodeList.h" -#include "ui/base/l10n/l10n_util.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/gfx/size.h" #include "url/gurl.h" diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc index 228aba7..20c7246 100644 --- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc +++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc @@ -12,6 +12,7 @@ #include "base/compiler_specific.h" #include "base/metrics/histogram.h" #include "base/rand_util.h" +#include "base/strings/string_util.h" #include "base/values.h" #include "chrome/common/cloud_print/cloud_print_constants.h" #include "chrome/service/cloud_print/cloud_print_auth.h" @@ -24,11 +25,9 @@ #include "components/cloud_devices/common/cloud_devices_switches.h" #include "google_apis/gaia/gaia_oauth_client.h" #include "google_apis/gaia/gaia_urls.h" -#include "grit/generated_resources.h" #include "jingle/notifier/base/notifier_options.h" #include "jingle/notifier/listener/push_client.h" #include "jingle/notifier/listener/push_client_observer.h" -#include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" namespace cloud_print { diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc index 9b3ec23..4144517 100644 --- a/chrome/service/cloud_print/print_system_cups.cc +++ b/chrome/service/cloud_print/print_system_cups.cc @@ -28,11 +28,9 @@ #include "chrome/common/cloud_print/cloud_print_constants.h" #include "chrome/common/crash_keys.h" #include "chrome/service/cloud_print/cloud_print_service_helpers.h" -#include "grit/generated_resources.h" #include "printing/backend/cups_helper.h" #include "printing/backend/print_backend.h" #include "printing/backend/print_backend_consts.h" -#include "ui/base/l10n/l10n_util.h" #include "url/gurl.h" namespace { diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc index 34d158f..a0939f5 100644 --- a/chrome/service/cloud_print/print_system_win.cc +++ b/chrome/service/cloud_print/print_system_win.cc @@ -20,12 +20,10 @@ #include "chrome/service/cloud_print/cdd_conversion_win.h" #include "chrome/service/service_process.h" #include "chrome/service/service_utility_process_host.h" -#include "grit/generated_resources.h" #include "printing/backend/win_helper.h" #include "printing/emf_win.h" #include "printing/page_range.h" #include "printing/printing_utils.h" -#include "ui/base/l10n/l10n_util.h" namespace cloud_print { |