diff options
Diffstat (limited to 'chrome/browser/chromeos/dom_ui')
18 files changed, 18 insertions, 18 deletions
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 { |