diff options
Diffstat (limited to 'chrome/browser/dom_ui/options')
19 files changed, 20 insertions, 21 deletions
diff --git a/chrome/browser/dom_ui/options/about_page_handler.cc b/chrome/browser/dom_ui/options/about_page_handler.cc index aada884..89fc14e 100644 --- a/chrome/browser/dom_ui/options/about_page_handler.cc +++ b/chrome/browser/dom_ui/options/about_page_handler.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/command_line.h" @@ -26,6 +25,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 "webkit/glue/webkit_glue.h" diff --git a/chrome/browser/dom_ui/options/add_startup_page_handler.cc b/chrome/browser/dom_ui/options/add_startup_page_handler.cc index 33b2326..819fce7 100644 --- a/chrome/browser/dom_ui/options/add_startup_page_handler.cc +++ b/chrome/browser/dom_ui/options/add_startup_page_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/options/add_startup_page_handler.h" -#include "app/l10n_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -15,6 +14,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" AddStartupPageHandler::AddStartupPageHandler() { } diff --git a/chrome/browser/dom_ui/options/advanced_options_handler.cc b/chrome/browser/dom_ui/options/advanced_options_handler.cc index 4535300..f3003a7 100644 --- a/chrome/browser/dom_ui/options/advanced_options_handler.cc +++ b/chrome/browser/dom_ui/options/advanced_options_handler.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/command_line.h" @@ -36,6 +35,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #if !defined(OS_CHROMEOS) #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/dom_ui/options/autofill_options_handler.cc b/chrome/browser/dom_ui/options/autofill_options_handler.cc index 3f82e53..2bebfb0 100644 --- a/chrome/browser/dom_ui/options/autofill_options_handler.cc +++ b/chrome/browser/dom_ui/options/autofill_options_handler.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/l10n_util.h" #include "base/logging.h" #include "base/string16.h" #include "base/string_number_conversions.h" @@ -19,6 +18,7 @@ #include "chrome/common/guid.h" #include "grit/generated_resources.h" #include "grit/webkit_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/dom_ui/options/browser_options_handler.cc b/chrome/browser/dom_ui/options/browser_options_handler.cc index b21572b..3bc02b2 100644 --- a/chrome/browser/dom_ui/options/browser_options_handler.cc +++ b/chrome/browser/dom_ui/options/browser_options_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/options/browser_options_handler.h" -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/scoped_ptr.h" #include "base/singleton.h" @@ -28,6 +27,7 @@ #include "chrome/installer/util/browser_distribution.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" BrowserOptionsHandler::BrowserOptionsHandler() : template_url_model_(NULL), startup_custom_pages_table_model_(NULL) { diff --git a/chrome/browser/dom_ui/options/certificate_manager_handler.cc b/chrome/browser/dom_ui/options/certificate_manager_handler.cc index ef7185d..78ce167 100644 --- a/chrome/browser/dom_ui/options/certificate_manager_handler.cc +++ b/chrome/browser/dom_ui/options/certificate_manager_handler.cc @@ -4,8 +4,6 @@ #include "chrome/browser/dom_ui/options/certificate_manager_handler.h" -#include "app/l10n_util.h" -#include "app/l10n_util_collator.h" #include "base/file_util.h" // for FileAccessProvider #include "base/safe_strerror_posix.h" #include "base/scoped_vector.h" @@ -22,6 +20,8 @@ #include "grit/generated_resources.h" #include "net/base/crypto_module.h" #include "net/base/x509_certificate.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_collator.h" namespace { diff --git a/chrome/browser/dom_ui/options/clear_browser_data_handler.cc b/chrome/browser/dom_ui/options/clear_browser_data_handler.cc index 6848aff..4882f12 100644 --- a/chrome/browser/dom_ui/options/clear_browser_data_handler.cc +++ b/chrome/browser/dom_ui/options/clear_browser_data_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/options/clear_browser_data_handler.h" -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/string16.h" #include "base/values.h" @@ -16,6 +15,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" ClearBrowserDataHandler::ClearBrowserDataHandler() : remover_(NULL) { } diff --git a/chrome/browser/dom_ui/options/content_settings_handler.cc b/chrome/browser/dom_ui/options/content_settings_handler.cc index 3220127..e486214 100644 --- a/chrome/browser/dom_ui/options/content_settings_handler.cc +++ b/chrome/browser/dom_ui/options/content_settings_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/options/content_settings_handler.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" @@ -25,6 +24,7 @@ #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/dom_ui/options/cookies_view_handler.cc b/chrome/browser/dom_ui/options/cookies_view_handler.cc index 62fbab9..7d26eec 100644 --- a/chrome/browser/dom_ui/options/cookies_view_handler.cc +++ b/chrome/browser/dom_ui/options/cookies_view_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/options/cookies_view_handler.h" -#include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/string_number_conversions.h" #include "base/string_split.h" @@ -18,6 +17,7 @@ #include "chrome/browser/profiles/profile.h" #include "grit/generated_resources.h" #include "net/base/cookie_monster.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/dom_ui/options/core_options_handler.cc b/chrome/browser/dom_ui/options/core_options_handler.cc index 8fc118d..bcf8d54 100644 --- a/chrome/browser/dom_ui/options/core_options_handler.cc +++ b/chrome/browser/dom_ui/options/core_options_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/options/core_options_handler.h" -#include "app/l10n_util.h" #include "base/string16.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" @@ -22,6 +21,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" CoreOptionsHandler::CoreOptionsHandler() {} diff --git a/chrome/browser/dom_ui/options/font_settings_handler.cc b/chrome/browser/dom_ui/options/font_settings_handler.cc index 215125a..442713f 100644 --- a/chrome/browser/dom_ui/options/font_settings_handler.cc +++ b/chrome/browser/dom_ui/options/font_settings_handler.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/string_number_conversions.h" #include "base/string_util.h" @@ -21,6 +20,7 @@ #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" FontSettingsHandler::FontSettingsHandler() { } diff --git a/chrome/browser/dom_ui/options/import_data_handler.cc b/chrome/browser/dom_ui/options/import_data_handler.cc index 2e86168..ee07b48 100644 --- a/chrome/browser/dom_ui/options/import_data_handler.cc +++ b/chrome/browser/dom_ui/options/import_data_handler.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/scoped_ptr.h" @@ -20,6 +19,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "chrome/browser/importer/importer_data_types.h" +#include "ui/base/l10n/l10n_util.h" ImportDataHandler::ImportDataHandler() : importer_host_(NULL) { } diff --git a/chrome/browser/dom_ui/options/language_options_handler.cc b/chrome/browser/dom_ui/options/language_options_handler.cc index 4dd937c..51e307b 100644 --- a/chrome/browser/dom_ui/options/language_options_handler.cc +++ b/chrome/browser/dom_ui/options/language_options_handler.cc @@ -10,7 +10,6 @@ #include <utility> #include <vector> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" @@ -28,6 +27,7 @@ #include "chrome/common/spellcheck_common.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/cros/cros_library.h" diff --git a/chrome/browser/dom_ui/options/options_ui_uitest.cc b/chrome/browser/dom_ui/options/options_ui_uitest.cc index abc022f..43bb213 100644 --- a/chrome/browser/dom_ui/options/options_ui_uitest.cc +++ b/chrome/browser/dom_ui/options/options_ui_uitest.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/command_line.h" #include "base/string16.h" #include "base/test/test_timeouts.h" @@ -14,9 +13,9 @@ #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/window_proxy.h" #include "chrome/test/ui/ui_test.h" - #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/dom_ui/options/password_manager_handler.cc b/chrome/browser/dom_ui/options/password_manager_handler.cc index 0c9eaa5..b638237 100644 --- a/chrome/browser/dom_ui/options/password_manager_handler.cc +++ b/chrome/browser/dom_ui/options/password_manager_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/options/password_manager_handler.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" @@ -17,6 +16,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" PasswordManagerHandler::PasswordManagerHandler() : ALLOW_THIS_IN_INITIALIZER_LIST(populater_(this)), diff --git a/chrome/browser/dom_ui/options/personal_options_handler.cc b/chrome/browser/dom_ui/options/personal_options_handler.cc index 75216b1..51659ca 100644 --- a/chrome/browser/dom_ui/options/personal_options_handler.cc +++ b/chrome/browser/dom_ui/options/personal_options_handler.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/path_service.h" @@ -33,6 +32,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" #if defined(OS_CHROMEOS) #include "chrome/browser/chromeos/login/user_manager.h" diff --git a/chrome/browser/dom_ui/options/search_engine_manager_handler.cc b/chrome/browser/dom_ui/options/search_engine_manager_handler.cc index d450631..f9b146d 100644 --- a/chrome/browser/dom_ui/options/search_engine_manager_handler.cc +++ b/chrome/browser/dom_ui/options/search_engine_manager_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/options/search_engine_manager_handler.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" @@ -17,6 +16,7 @@ #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/dom_ui/options/startup_page_manager_handler.cc b/chrome/browser/dom_ui/options/startup_page_manager_handler.cc index aabae28..51b4967 100644 --- a/chrome/browser/dom_ui/options/startup_page_manager_handler.cc +++ b/chrome/browser/dom_ui/options/startup_page_manager_handler.cc @@ -4,10 +4,10 @@ #include "chrome/browser/dom_ui/options/startup_page_manager_handler.h" -#include "app/l10n_util.h" #include "base/values.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" StartupPageManagerHandler::StartupPageManagerHandler() { } diff --git a/chrome/browser/dom_ui/options/stop_syncing_handler.cc b/chrome/browser/dom_ui/options/stop_syncing_handler.cc index 833c88e..1ab2025 100644 --- a/chrome/browser/dom_ui/options/stop_syncing_handler.cc +++ b/chrome/browser/dom_ui/options/stop_syncing_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/options/stop_syncing_handler.h" -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/values.h" #include "base/callback.h" @@ -13,6 +12,7 @@ #include "chrome/browser/sync/profile_sync_service.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" +#include "ui/base/l10n/l10n_util.h" StopSyncingHandler::StopSyncingHandler() { } |