diff options
Diffstat (limited to 'chrome/browser/chromeos')
72 files changed, 74 insertions, 74 deletions
diff --git a/chrome/browser/chromeos/cros/network_library.cc b/chrome/browser/chromeos/cros/network_library.cc index 8373bbb..6750207 100644 --- a/chrome/browser/chromeos/cros/network_library.cc +++ b/chrome/browser/chromeos/cros/network_library.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <map> -#include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" @@ -20,6 +19,7 @@ #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/common/time_format.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc b/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc index 9d9be53..c0a5648 100644 --- a/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/accounts_options_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/dom_ui/accounts_options_handler.h" -#include "app/l10n_util.h" #include "base/json/json_reader.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" @@ -13,6 +12,7 @@ #include "chrome/browser/chromeos/user_cros_settings_provider.h" #include "chrome/browser/dom_ui/dom_ui_util.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.cc b/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.cc index f237ad9..88ee071 100644 --- a/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/cros_personal_options_handler.cc @@ -4,12 +4,12 @@ #include "chrome/browser/chromeos/dom_ui/cros_personal_options_handler.h" -#include "app/l10n_util.h" #include "base/values.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "chrome/browser/dom_ui/dom_ui_util.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc index 5a5da77..fefee0a 100644 --- a/chrome/browser/chromeos/dom_ui/imageburner_ui.cc +++ b/chrome/browser/chromeos/dom_ui/imageburner_ui.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/path_service.h" @@ -26,6 +25,7 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc index a447339..00454cd 100644 --- a/chrome/browser/chromeos/dom_ui/internet_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/internet_options_handler.cc @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/base64.h" #include "base/basictypes.h" #include "base/callback.h" @@ -34,6 +33,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/window/window.h" diff --git a/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc b/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc index 2630d4c..8056cfc 100644 --- a/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc +++ b/chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/dom_ui/keyboard_overlay_ui.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/values.h" #include "base/weak_ptr.h" @@ -18,6 +17,7 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "third_party/cros/chromeos_input_method.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/chromeos/dom_ui/language_chewing_options_handler.cc b/chrome/browser/chromeos/dom_ui/language_chewing_options_handler.cc index 6f1eed3..ad9152d 100644 --- a/chrome/browser/chromeos/dom_ui/language_chewing_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/language_chewing_options_handler.cc @@ -6,7 +6,6 @@ #include <limits> -#include "app/l10n_util.h" #include "base/logging.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" @@ -14,6 +13,7 @@ #include "chrome/browser/chromeos/dom_ui/language_options_util.h" #include "chrome/browser/chromeos/language_preferences.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { const char kI18nPrefix[] = "Chewing_"; diff --git a/chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.cc b/chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.cc index 56e4448..0104b6e 100644 --- a/chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.cc +++ b/chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.cc @@ -4,10 +4,10 @@ #include "chrome/browser/chromeos/dom_ui/language_customize_modifier_keys_handler.h" -#include "app/l10n_util.h" #include "base/values.h" #include "grit/generated_resources.h" #include "third_party/cros/chromeos_keyboard.h" +#include "ui/base/l10n/l10n_util.h" namespace { const struct ModifierKeysSelectItem { diff --git a/chrome/browser/chromeos/dom_ui/language_hangul_options_handler.cc b/chrome/browser/chromeos/dom_ui/language_hangul_options_handler.cc index 46a8e2d..598385a 100644 --- a/chrome/browser/chromeos/dom_ui/language_hangul_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/language_hangul_options_handler.cc @@ -4,11 +4,11 @@ #include "chrome/browser/chromeos/dom_ui/language_hangul_options_handler.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/language_preferences.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.cc b/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.cc index 7015dd9..f3fafa4 100644 --- a/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/language_mozc_options_handler.cc @@ -4,13 +4,13 @@ #include "chrome/browser/chromeos/dom_ui/language_mozc_options_handler.h" -#include "app/l10n_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/dom_ui/language_options_util.h" #include "chrome/browser/chromeos/language_preferences.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { const char kI18nPrefix[] = "mozc_"; diff --git a/chrome/browser/chromeos/dom_ui/language_options_util.h b/chrome/browser/chromeos/dom_ui/language_options_util.h index 718158f..a6a4837 100644 --- a/chrome/browser/chromeos/dom_ui/language_options_util.h +++ b/chrome/browser/chromeos/dom_ui/language_options_util.h @@ -8,10 +8,10 @@ #include <string> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/chromeos/language_preferences.h" +#include "ui/base/l10n/l10n_util.h" class ListValue; diff --git a/chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.cc b/chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.cc index f2c1f0d..6609543 100644 --- a/chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.cc @@ -4,11 +4,11 @@ #include "chrome/browser/chromeos/dom_ui/language_pinyin_options_handler.h" -#include "app/l10n_util.h" #include "base/values.h" #include "chrome/browser/chromeos/dom_ui/language_options_util.h" #include "chrome/browser/chromeos/language_preferences.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { const char kI18nPrefix[] = "Pinyin"; diff --git a/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc b/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc index 9bf458a..7a8835a 100644 --- a/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc +++ b/chrome/browser/chromeos/dom_ui/mobile_setup_ui.cc @@ -8,7 +8,6 @@ #include <map> #include <string> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/file_util.h" #include "base/json/json_reader.h" @@ -38,6 +37,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/chromeos/dom_ui/network_menu_ui.cc b/chrome/browser/chromeos/dom_ui/network_menu_ui.cc index 8e1f50d..70ba4d3 100644 --- a/chrome/browser/chromeos/dom_ui/network_menu_ui.cc +++ b/chrome/browser/chromeos/dom_ui/network_menu_ui.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/dom_ui/network_menu_ui.h" -#include "app/l10n_util.h" #include "base/values.h" #include "base/string_number_conversions.h" #include "base/string_util.h" @@ -19,6 +18,7 @@ #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/menu/menu_2.h" namespace { diff --git a/chrome/browser/chromeos/dom_ui/proxy_handler.cc b/chrome/browser/chromeos/dom_ui/proxy_handler.cc index be7f5d8..e625730 100644 --- a/chrome/browser/chromeos/dom_ui/proxy_handler.cc +++ b/chrome/browser/chromeos/dom_ui/proxy_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/dom_ui/proxy_handler.h" -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/stl_util-inl.h" @@ -17,6 +16,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/chromeos/dom_ui/system_info_ui.cc b/chrome/browser/chromeos/dom_ui/system_info_ui.cc index 500e59d..a0e7c25 100644 --- a/chrome/browser/chromeos/dom_ui/system_info_ui.cc +++ b/chrome/browser/chromeos/dom_ui/system_info_ui.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/dom_ui/system_info_ui.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/message_loop.h" #include "base/path_service.h" @@ -28,6 +27,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" class SystemInfoUIHTMLSource : public ChromeURLDataManager::DataSource { diff --git a/chrome/browser/chromeos/dom_ui/system_options_handler.cc b/chrome/browser/chromeos/dom_ui/system_options_handler.cc index d543871..76313e2 100644 --- a/chrome/browser/chromeos/dom_ui/system_options_handler.cc +++ b/chrome/browser/chromeos/dom_ui/system_options_handler.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/string_number_conversions.h" @@ -19,6 +18,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" SystemOptionsHandler::SystemOptionsHandler() : chromeos::CrosOptionsPageUIHandler( diff --git a/chrome/browser/chromeos/dom_ui/system_settings_provider.cc b/chrome/browser/chromeos/dom_ui/system_settings_provider.cc index 2667e0c..c5ab71a 100644 --- a/chrome/browser/chromeos/dom_ui/system_settings_provider.cc +++ b/chrome/browser/chromeos/dom_ui/system_settings_provider.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/scoped_ptr.h" #include "base/stl_util-inl.h" @@ -21,6 +20,7 @@ #include "chrome/browser/chromeos/cros_settings_names.h" #include "chrome/browser/chromeos/login/ownership_service.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "unicode/calendar.h" #include "unicode/timezone.h" #include "unicode/ures.h" diff --git a/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc b/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc index 1f3459e..2b98d37 100644 --- a/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc +++ b/chrome/browser/chromeos/dom_ui/wrench_menu_ui.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/dom_ui/wrench_menu_ui.h" -#include "app/l10n_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -22,6 +21,7 @@ #include "googleurl/src/gurl.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/menu/menu_2.h" namespace { diff --git a/chrome/browser/chromeos/external_protocol_dialog.cc b/chrome/browser/chromeos/external_protocol_dialog.cc index f6c0813..92fa746 100644 --- a/chrome/browser/chromeos/external_protocol_dialog.cc +++ b/chrome/browser/chromeos/external_protocol_dialog.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/external_protocol_dialog.h" -#include "app/l10n_util.h" #include "base/metrics/histogram.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -16,6 +15,7 @@ #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" #include "ui/base/text/text_elider.h" #include "views/controls/message_box_view.h" diff --git a/chrome/browser/chromeos/input_method/candidate_window_main.cc b/chrome/browser/chromeos/input_method/candidate_window_main.cc index 4e54cf0..0ffed0d 100644 --- a/chrome/browser/chromeos/input_method/candidate_window_main.cc +++ b/chrome/browser/chromeos/input_method/candidate_window_main.cc @@ -9,7 +9,6 @@ #include <string> #include "app/app_paths.h" -#include "app/l10n_util.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/message_loop.h" @@ -20,6 +19,7 @@ #include "chrome/common/chrome_switches.h" #include "grit/app_locale_settings.h" #include "third_party/cros/chromeos_cros_api.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" #include "views/focus/accelerator_handler.h" diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc index 28ca1c5..7b96a2e 100644 --- a/chrome/browser/chromeos/input_method/input_method_util.cc +++ b/chrome/browser/chromeos/input_method/input_method_util.cc @@ -11,8 +11,6 @@ #include "unicode/uloc.h" -#include "app/l10n_util.h" -#include "app/l10n_util_collator.h" #include "base/basictypes.h" #include "base/hash_tables.h" #include "base/scoped_ptr.h" @@ -25,6 +23,8 @@ #include "chrome/browser/chromeos/cros/keyboard_library.h" #include "chrome/browser/chromeos/language_preferences.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_collator.h" namespace { 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 fbcdd98..acfaec3 100644 --- a/chrome/browser/chromeos/input_method/input_method_util_unittest.cc +++ b/chrome/browser/chromeos/input_method/input_method_util_unittest.cc @@ -6,10 +6,10 @@ #include <string> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/l10n/l10n_util.h" namespace chromeos { namespace input_method { diff --git a/chrome/browser/chromeos/locale_change_guard.cc b/chrome/browser/chromeos/locale_change_guard.cc index 627c992..fe9cf95 100644 --- a/chrome/browser/chromeos/locale_change_guard.cc +++ b/chrome/browser/chromeos/locale_change_guard.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/locale_change_guard.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/browser_process.h" @@ -17,6 +16,7 @@ #include "chrome/common/pref_names.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/chromeos/login/background_view.cc b/chrome/browser/chromeos/login/background_view.cc index cf6da1b..2feeccd 100644 --- a/chrome/browser/chromeos/login/background_view.cc +++ b/chrome/browser/chromeos/login/background_view.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/string16.h" #include "base/string_util.h" #include "base/stringprintf.h" @@ -33,6 +32,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/cros/chromeos_wm_ipc_enums.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/x/x11_util.h" #include "views/controls/button/text_button.h" diff --git a/chrome/browser/chromeos/login/captcha_view.cc b/chrome/browser/chromeos/login/captcha_view.cc index cf16199..e7e8e01 100644 --- a/chrome/browser/chromeos/login/captcha_view.cc +++ b/chrome/browser/chromeos/login/captcha_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/captcha_view.h" -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/helper.h" @@ -15,6 +14,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "views/background.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/chromeos/login/eula_view.cc b/chrome/browser/chromeos/login/eula_view.cc index 63c9422..afc3e31 100644 --- a/chrome/browser/chromeos/login/eula_view.cc +++ b/chrome/browser/chromeos/login/eula_view.cc @@ -8,7 +8,6 @@ #include <sys/types.h> #include <string> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/message_loop.h" #include "base/task.h" @@ -35,6 +34,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index e261b7d..0595686 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -8,7 +8,6 @@ #include <functional> #include <map> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/message_loop.h" #include "base/stl_util-inl.h" @@ -37,6 +36,7 @@ #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" #include "views/screen.h" #include "views/widget/widget_gtk.h" diff --git a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc index 9cedaff..0128b05 100644 --- a/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/l10n_util.h" #include "base/message_loop.h" #include "chrome/browser/chromeos/cros/cros_mock.h" #include "chrome/browser/chromeos/cros/mock_cryptohome_library.h" @@ -18,6 +17,7 @@ #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" namespace chromeos { @@ -65,7 +65,7 @@ class ExistingUserControllerTest : public WizardInProcessBrowserTest { virtual void SetUpWizard() { gfx::Rect background_bounds(login::kWizardScreenWidth, login::kWizardScreenHeight); - ExistingUserController* controller = + ExistingUserController* controller = new ExistingUserController(std::vector<UserManager::User>(), background_bounds); controller->Init(); diff --git a/chrome/browser/chromeos/login/existing_user_view.cc b/chrome/browser/chromeos/login/existing_user_view.cc index ab7e3bf..edb04f4 100644 --- a/chrome/browser/chromeos/login/existing_user_view.cc +++ b/chrome/browser/chromeos/login/existing_user_view.cc @@ -4,12 +4,12 @@ #include "chrome/browser/chromeos/login/existing_user_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/user_controller.h" #include "chrome/browser/chromeos/login/textfield_with_margin.h" #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/background.h" #include "views/focus/focus_manager.h" #include "views/fill_layout.h" diff --git a/chrome/browser/chromeos/login/guest_user_view.cc b/chrome/browser/chromeos/login/guest_user_view.cc index 0dd63124..89acb3e 100644 --- a/chrome/browser/chromeos/login/guest_user_view.cc +++ b/chrome/browser/chromeos/login/guest_user_view.cc @@ -4,11 +4,11 @@ #include "chrome/browser/chromeos/login/guest_user_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/user_controller.h" #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/help_app_launcher.cc b/chrome/browser/chromeos/login/help_app_launcher.cc index 988e015..2db8032 100644 --- a/chrome/browser/chromeos/login/help_app_launcher.cc +++ b/chrome/browser/chromeos/login/help_app_launcher.cc @@ -4,13 +4,13 @@ #include <string> -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/help_app_launcher.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/keyboard_switch_menu.cc b/chrome/browser/chromeos/login/keyboard_switch_menu.cc index 8a8b3f7..278d578 100644 --- a/chrome/browser/chromeos/login/keyboard_switch_menu.cc +++ b/chrome/browser/chromeos/login/keyboard_switch_menu.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/keyboard_switch_menu.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" @@ -12,6 +11,7 @@ #include "chrome/browser/chromeos/input_method/input_method_util.h" #include "chrome/browser/chromeos/status/status_area_host.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/widget/widget_gtk.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/login_performer.cc b/chrome/browser/chromeos/login/login_performer.cc index ad89594..c28e1fb 100644 --- a/chrome/browser/chromeos/login/login_performer.cc +++ b/chrome/browser/chromeos/login/login_performer.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" @@ -25,6 +24,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "grit/generated_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/login_screen.cc b/chrome/browser/chromeos/login/login_screen.cc index cbc6f35..7986cc8 100644 --- a/chrome/browser/chromeos/login/login_screen.cc +++ b/chrome/browser/chromeos/login/login_screen.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/login_screen.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/command_line.h" #include "base/logging.h" @@ -24,6 +23,7 @@ #include "chrome/browser/profiles/profile_manager.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" namespace chromeos { diff --git a/chrome/browser/chromeos/login/network_screen.cc b/chrome/browser/chromeos/login/network_screen.cc index 45c6bdf..909d19f 100644 --- a/chrome/browser/chromeos/login/network_screen.cc +++ b/chrome/browser/chromeos/login/network_screen.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/network_screen.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/string16.h" #include "base/utf_string_conversions.h" @@ -15,6 +14,7 @@ #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" #include "views/controls/menu/menu_2.h" #include "views/widget/widget.h" diff --git a/chrome/browser/chromeos/login/network_screen_browsertest.cc b/chrome/browser/chromeos/login/network_screen_browsertest.cc index 575ebc5..2a2dee5 100644 --- a/chrome/browser/chromeos/login/network_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/network_screen_browsertest.cc @@ -4,7 +4,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "base/string16.h" @@ -25,6 +24,7 @@ #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 "views/controls/button/text_button.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/network_selection_view.cc b/chrome/browser/chromeos/login/network_selection_view.cc index a62ce07..9e0ee28 100644 --- a/chrome/browser/chromeos/login/network_selection_view.cc +++ b/chrome/browser/chromeos/login/network_selection_view.cc @@ -8,7 +8,6 @@ #include <sys/types.h> #include <string> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/keyboard_switch_menu.h" @@ -22,6 +21,7 @@ #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" #include "views/controls/label.h" #include "views/controls/throbber.h" diff --git a/chrome/browser/chromeos/login/new_user_view.cc b/chrome/browser/chromeos/login/new_user_view.cc index cf803bb..eb6927a 100644 --- a/chrome/browser/chromeos/login/new_user_view.cc +++ b/chrome/browser/chromeos/login/new_user_view.cc @@ -10,7 +10,6 @@ #include <algorithm> #include <vector> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/command_line.h" #include "base/message_loop.h" @@ -28,6 +27,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/label.h" #include "views/controls/throbber.h" diff --git a/chrome/browser/chromeos/login/oobe_progress_bar.cc b/chrome/browser/chromeos/login/oobe_progress_bar.cc index 24ab9ee..75c4537 100644 --- a/chrome/browser/chromeos/login/oobe_progress_bar.cc +++ b/chrome/browser/chromeos/login/oobe_progress_bar.cc @@ -4,12 +4,12 @@ #include "chrome/browser/chromeos/login/oobe_progress_bar.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #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" namespace chromeos { diff --git a/chrome/browser/chromeos/login/password_changed_view.cc b/chrome/browser/chromeos/login/password_changed_view.cc index 7a28a07..fe74299 100644 --- a/chrome/browser/chromeos/login/password_changed_view.cc +++ b/chrome/browser/chromeos/login/password_changed_view.cc @@ -4,13 +4,13 @@ #include "chrome/browser/chromeos/login/password_changed_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/button/radio_button.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/login/screen_lock_view.cc b/chrome/browser/chromeos/login/screen_lock_view.cc index 85377c2..6981b62 100644 --- a/chrome/browser/chromeos/login/screen_lock_view.cc +++ b/chrome/browser/chromeos/login/screen_lock_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/screen_lock_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" #include "chrome/browser/chromeos/login/screen_locker.h" @@ -18,6 +17,7 @@ #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/border.h" diff --git a/chrome/browser/chromeos/login/screen_locker.cc b/chrome/browser/chromeos/login/screen_locker.cc index 6e15052..b25230f 100644 --- a/chrome/browser/chromeos/login/screen_locker.cc +++ b/chrome/browser/chromeos/login/screen_locker.cc @@ -12,7 +12,6 @@ // Evil hack to undo X11 evil #define. See crosbug.com/ #undef Status -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/metrics/histogram.h" @@ -47,6 +46,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/cros/chromeos_wm_ipc_enums.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/x/x11_util.h" #include "views/screen.h" diff --git a/chrome/browser/chromeos/login/shutdown_button.cc b/chrome/browser/chromeos/login/shutdown_button.cc index 168cf60..f52b1fc 100644 --- a/chrome/browser/chromeos/login/shutdown_button.cc +++ b/chrome/browser/chromeos/login/shutdown_button.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/shutdown_button.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/cros/power_library.h" @@ -13,6 +12,7 @@ #include "gfx/gtk_util.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 "views/background.h" diff --git a/chrome/browser/chromeos/login/update_view.cc b/chrome/browser/chromeos/login/update_view.cc index 0e56cec..08fa2b18b 100644 --- a/chrome/browser/chromeos/login/update_view.cc +++ b/chrome/browser/chromeos/login/update_view.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" @@ -14,6 +13,7 @@ #include "chrome/browser/chromeos/login/wizard_accessibility_helper.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" #include "views/border.h" #include "views/controls/label.h" diff --git a/chrome/browser/chromeos/login/user_controller.cc b/chrome/browser/chromeos/login/user_controller.cc index 773391d..5fd8a7f 100644 --- a/chrome/browser/chromeos/login/user_controller.cc +++ b/chrome/browser/chromeos/login/user_controller.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <vector> -#include "app/l10n_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/user_cros_settings_provider.h" @@ -24,6 +23,7 @@ #include "gfx/canvas.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 "views/background.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/chromeos/login/user_controller_unittest.cc b/chrome/browser/chromeos/login/user_controller_unittest.cc index 3cf7ce4..5f18414 100644 --- a/chrome/browser/chromeos/login/user_controller_unittest.cc +++ b/chrome/browser/chromeos/login/user_controller_unittest.cc @@ -4,11 +4,11 @@ #include "chrome/browser/chromeos/login/user_controller.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/user_manager.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/l10n/l10n_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/login/user_image_view.cc b/chrome/browser/chromeos/login/user_image_view.cc index a689c53..3025607 100644 --- a/chrome/browser/chromeos/login/user_image_view.cc +++ b/chrome/browser/chromeos/login/user_image_view.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/helper.h" @@ -17,6 +16,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/chromeos/login/user_view.cc b/chrome/browser/chromeos/login/user_view.cc index 184da51..f6025f2 100644 --- a/chrome/browser/chromeos/login/user_view.cc +++ b/chrome/browser/chromeos/login/user_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/user_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/login/helper.h" #include "chrome/browser/chromeos/login/rounded_rect_painter.h" @@ -15,6 +14,7 @@ #include "gfx/rect.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 "views/background.h" #include "views/controls/button/text_button.h" diff --git a/chrome/browser/chromeos/login/web_page_view.cc b/chrome/browser/chromeos/login/web_page_view.cc index e94ff1c..4e8fec8 100644 --- a/chrome/browser/chromeos/login/web_page_view.cc +++ b/chrome/browser/chromeos/login/web_page_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/web_page_view.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/logging.h" #include "base/string_util.h" @@ -21,6 +20,7 @@ #include "grit/theme_resources.h" #include "ipc/ipc_message.h" #include "third_party/skia/include/core/SkColor.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/border.h" diff --git a/chrome/browser/chromeos/login/wizard_accessibility_handler.cc b/chrome/browser/chromeos/login/wizard_accessibility_handler.cc index 5a66e0f..0a90880 100644 --- a/chrome/browser/chromeos/login/wizard_accessibility_handler.cc +++ b/chrome/browser/chromeos/login/wizard_accessibility_handler.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/i18n/char_iterator.h" #include "base/logging.h" #include "base/scoped_ptr.h" @@ -21,6 +20,7 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_source.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace keys = extension_accessibility_api_constants; diff --git a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc index 955b1e4..e747462 100644 --- a/chrome/browser/chromeos/login/wizard_accessibility_helper.cc +++ b/chrome/browser/chromeos/login/wizard_accessibility_helper.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/login/wizard_accessibility_helper.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "chrome/browser/browser_process.h" @@ -16,6 +15,7 @@ #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/accelerator.h" #include "views/view.h" diff --git a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc index 299dfaa..1290852 100644 --- a/chrome/browser/chromeos/login/wizard_controller_browsertest.cc +++ b/chrome/browser/chromeos/login/wizard_controller_browsertest.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/login/account_screen.h" @@ -19,6 +18,7 @@ #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 "unicode/locid.h" #include "views/accelerator.h" diff --git a/chrome/browser/chromeos/low_battery_observer.cc b/chrome/browser/chromeos/low_battery_observer.cc index 0513cc2..6e307ea 100644 --- a/chrome/browser/chromeos/low_battery_observer.cc +++ b/chrome/browser/chromeos/low_battery_observer.cc @@ -4,11 +4,11 @@ #include "chrome/browser/chromeos/low_battery_observer.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/time_format.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/network_list.cc b/chrome/browser/chromeos/network_list.cc index c22795b..89cff35 100644 --- a/chrome/browser/chromeos/network_list.cc +++ b/chrome/browser/chromeos/network_list.cc @@ -4,10 +4,10 @@ #include "chrome/browser/chromeos/network_list.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace chromeos { diff --git a/chrome/browser/chromeos/network_message_observer.cc b/chrome/browser/chromeos/network_message_observer.cc index ef6c663..b2a2bb0 100644 --- a/chrome/browser/chromeos/network_message_observer.cc +++ b/chrome/browser/chromeos/network_message_observer.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/network_message_observer.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" @@ -20,6 +19,7 @@ #include "chrome/common/time_format.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/chromeos/notifications/balloon_view.cc b/chrome/browser/chromeos/notifications/balloon_view.cc index d4c5b1e..200bc73 100644 --- a/chrome/browser/chromeos/notifications/balloon_view.cc +++ b/chrome/browser/chromeos/notifications/balloon_view.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/notifications/balloon_view_host.h" @@ -23,6 +22,7 @@ #include "chrome/common/notification_type.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" #include "views/background.h" diff --git a/chrome/browser/chromeos/notifications/notification_panel.cc b/chrome/browser/chromeos/notifications/notification_panel.cc index 04f0899..af15c54 100644 --- a/chrome/browser/chromeos/notifications/notification_panel.cc +++ b/chrome/browser/chromeos/notifications/notification_panel.cc @@ -8,7 +8,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "chrome/browser/chromeos/notifications/balloon_collection_impl.h" #include "chrome/browser/chromeos/notifications/balloon_view.h" #include "chrome/common/notification_details.h" @@ -16,6 +15,7 @@ #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "third_party/cros/chromeos_wm_ipc_enums.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/native/native_view_host.h" diff --git a/chrome/browser/chromeos/offline/offline_load_page.cc b/chrome/browser/chromeos/offline/offline_load_page.cc index 6f00786..d8eb3a6 100644 --- a/chrome/browser/chromeos/offline/offline_load_page.cc +++ b/chrome/browser/chromeos/offline/offline_load_page.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/offline/offline_load_page.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" #include "base/string_piece.h" @@ -27,6 +26,7 @@ #include "chrome/common/url_constants.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/chromeos/options/internet_page_view.cc b/chrome/browser/chromeos/options/internet_page_view.cc index f4b63766..760735f 100644 --- a/chrome/browser/chromeos/options/internet_page_view.cc +++ b/chrome/browser/chromeos/options/internet_page_view.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" @@ -16,6 +15,7 @@ #include "chrome/browser/ui/views/window.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 "views/controls/button/native_button.h" #include "views/controls/combobox/combobox.h" diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc index 45c1ec3..badd6b7 100644 --- a/chrome/browser/chromeos/options/network_config_view.cc +++ b/chrome/browser/chromeos/options/network_config_view.cc @@ -6,13 +6,13 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/options/wifi_config_view.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "views/grid_layout.h" #include "views/standard_layout.h" #include "views/widget/widget_gtk.h" diff --git a/chrome/browser/chromeos/options/options_window_view.cc b/chrome/browser/chromeos/options/options_window_view.cc index a107b25..1cc4a62 100644 --- a/chrome/browser/chromeos/options/options_window_view.cc +++ b/chrome/browser/chromeos/options/options_window_view.cc @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/l10n_util.h" #include "base/scoped_ptr.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/options/internet_page_view.h" @@ -22,6 +21,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/native/native_view_host.h" #include "views/controls/tabbed_pane/native_tabbed_pane_gtk.h" #include "views/controls/tabbed_pane/tabbed_pane.h" diff --git a/chrome/browser/chromeos/options/settings_page_view.cc b/chrome/browser/chromeos/options/settings_page_view.cc index 15be561..2e56666 100644 --- a/chrome/browser/chromeos/options/settings_page_view.cc +++ b/chrome/browser/chromeos/options/settings_page_view.cc @@ -4,10 +4,10 @@ #include "chrome/browser/chromeos/options/settings_page_view.h" -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "gfx/skia_utils_gtk.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/label.h" #include "views/fill_layout.h" diff --git a/chrome/browser/chromeos/options/system_page_view.cc b/chrome/browser/chromeos/options/system_page_view.cc index da659c5..18e9db8 100644 --- a/chrome/browser/chromeos/options/system_page_view.cc +++ b/chrome/browser/chromeos/options/system_page_view.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/stl_util-inl.h" #include "base/string16.h" #include "base/string_util.h" @@ -22,6 +21,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/combobox_model.h" #include "unicode/timezone.h" #include "views/controls/button/checkbox.h" diff --git a/chrome/browser/chromeos/options/wifi_config_view.cc b/chrome/browser/chromeos/options/wifi_config_view.cc index ad1cd76d..a24d928 100644 --- a/chrome/browser/chromeos/options/wifi_config_view.cc +++ b/chrome/browser/chromeos/options/wifi_config_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/options/wifi_config_view.h" -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" @@ -14,6 +13,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/chromeos/status/clock_menu_button.cc b/chrome/browser/chromeos/status/clock_menu_button.cc index 044c540..08d1c61 100644 --- a/chrome/browser/chromeos/status/clock_menu_button.cc +++ b/chrome/browser/chromeos/status/clock_menu_button.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/status/clock_menu_button.h" -#include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/string_util.h" #include "base/time.h" @@ -14,6 +13,7 @@ #include "gfx/canvas.h" #include "gfx/font.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace chromeos { diff --git a/chrome/browser/chromeos/status/input_method_menu.cc b/chrome/browser/chromeos/status/input_method_menu.cc index 38946c4..94f09ff 100644 --- a/chrome/browser/chromeos/status/input_method_menu.cc +++ b/chrome/browser/chromeos/status/input_method_menu.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/string_split.h" #include "base/string_util.h" #include "base/time.h" @@ -23,6 +22,7 @@ #include "chrome/common/pref_names.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" // The language menu consists of 3 parts (in this order): diff --git a/chrome/browser/chromeos/status/network_dropdown_button.cc b/chrome/browser/chromeos/status/network_dropdown_button.cc index b989e6a..9e8d348 100644 --- a/chrome/browser/chromeos/status/network_dropdown_button.cc +++ b/chrome/browser/chromeos/status/network_dropdown_button.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/status/network_dropdown_button.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" #include "chrome/browser/chromeos/options/network_config_view.h" @@ -12,6 +11,7 @@ #include "gfx/canvas_skia.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 "views/window/window.h" diff --git a/chrome/browser/chromeos/status/network_menu.cc b/chrome/browser/chromeos/status/network_menu.cc index 3a27615..ac43bd4 100644 --- a/chrome/browser/chromeos/status/network_menu.cc +++ b/chrome/browser/chromeos/status/network_menu.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" @@ -22,6 +21,7 @@ #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 "views/controls/menu/menu_2.h" #include "views/window/window.h" diff --git a/chrome/browser/chromeos/status/network_menu_button.cc b/chrome/browser/chromeos/status/network_menu_button.cc index 4943af9..c1f59e0 100644 --- a/chrome/browser/chromeos/status/network_menu_button.cc +++ b/chrome/browser/chromeos/status/network_menu_button.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <limits> -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/chromeos/cros/cros_library.h" @@ -16,6 +15,7 @@ #include "gfx/canvas_skia.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 "views/window/window.h" diff --git a/chrome/browser/chromeos/status/power_menu_button.cc b/chrome/browser/chromeos/status/power_menu_button.cc index 20f77e6..13adb7c 100644 --- a/chrome/browser/chromeos/status/power_menu_button.cc +++ b/chrome/browser/chromeos/status/power_menu_button.cc @@ -4,7 +4,6 @@ #include "chrome/browser/chromeos/status/power_menu_button.h" -#include "app/l10n_util.h" #include "base/string_number_conversions.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -12,6 +11,7 @@ #include "gfx/canvas.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" namespace chromeos { diff --git a/chrome/browser/chromeos/update_observer.cc b/chrome/browser/chromeos/update_observer.cc index 60bd1e8..33b13a1 100644 --- a/chrome/browser/chromeos/update_observer.cc +++ b/chrome/browser/chromeos/update_observer.cc @@ -4,12 +4,12 @@ #include "chrome/browser/chromeos/update_observer.h" -#include "app/l10n_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/common/time_format.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace chromeos { |