diff options
616 files changed, 783 insertions, 702 deletions
diff --git a/app/app.gyp b/app/app.gyp index a7f4da8..6aea564 100644 --- a/app/app.gyp +++ b/app/app.gyp @@ -45,6 +45,8 @@ '../ui/base/animation/slide_animation_unittest.cc', '../ui/base/clipboard/clipboard_unittest.cc', '../ui/base/dragdrop/os_exchange_data_win_unittest.cc', + '../ui/base/l10n/l10n_util_mac_unittest.mm', + '../ui/base/l10n/l10n_util_unittest.cc', '../ui/base/models/tree_node_iterator_unittest.cc', '../ui/base/models/tree_node_model_unittest.cc', '../ui/base/resource/data_pack_unittest.cc', @@ -52,8 +54,6 @@ '../ui/base/test/data/resource.h', '../ui/base/text/text_elider_unittest.cc', '../ui/base/view_prop_unittest.cc', - 'l10n_util_mac_unittest.mm', - 'l10n_util_unittest.cc', 'run_all_unittests.cc', 'sql/connection_unittest.cc', 'sql/statement_unittest.cc', diff --git a/app/app_base.gypi b/app/app_base.gypi index e435f9d..5e17b4b 100644 --- a/app/app_base.gypi +++ b/app/app_base.gypi @@ -151,6 +151,14 @@ '../ui/base/keycodes/keyboard_codes_posix.h', '../ui/base/l10n/l10n_font_util.h', '../ui/base/l10n/l10n_font_util.cc', + '../ui/base/l10n/l10n_util.cc', + '../ui/base/l10n/l10n_util.h', + '../ui/base/l10n/l10n_util_collator.h', + '../ui/base/l10n/l10n_util_mac.h', + '../ui/base/l10n/l10n_util_mac.mm', + '../ui/base/l10n/l10n_util_posix.cc', + '../ui/base/l10n/l10n_util_win.cc', + '../ui/base/l10n/l10n_util_win.h', '../ui/base/message_box_flags.h', '../ui/base/models/accelerator.h', '../ui/base/models/accelerator_gtk.h', @@ -206,14 +214,6 @@ 'gfx/gl/gl_implementation_win.cc', 'gfx/gl/gl_interface.h', 'gfx/gl/gl_interface.cc', - 'l10n_util.cc', - 'l10n_util.h', - 'l10n_util_collator.h', - 'l10n_util_mac.h', - 'l10n_util_mac.mm', - 'l10n_util_posix.cc', - 'l10n_util_win.cc', - 'l10n_util_win.h', 'mac/nsimage_cache.h', 'mac/nsimage_cache.mm', 'mac/scoped_nsdisable_screen_updates.h', diff --git a/app/win/win_util.cc b/app/win/win_util.cc index 7076a5f..f372ae5 100644 --- a/app/win/win_util.cc +++ b/app/win/win_util.cc @@ -9,8 +9,6 @@ #include <algorithm> -#include "app/l10n_util.h" -#include "app/l10n_util_win.h" #include "base/base_switches.h" #include "base/command_line.h" #include "base/file_util.h" @@ -24,6 +22,8 @@ #include "gfx/codec/png_codec.h" #include "gfx/font.h" #include "gfx/gdi_util.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_win.h" namespace app { namespace win { diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc index 9cd4897..621350d 100644 --- a/chrome/app/chrome_main.cc +++ b/chrome/app/chrome_main.cc @@ -50,7 +50,6 @@ #endif #if defined(OS_MACOSX) -#include "app/l10n_util_mac.h" #include "base/mac/mac_util.h" #include "base/mac/os_crash_dumps.h" #include "base/mach_ipc_mac.h" @@ -59,6 +58,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "grit/chromium_strings.h" #include "third_party/WebKit/Source/WebKit/mac/WebCoreSupport/WebSystemInterface.h" +#include "ui/base/l10n/l10n_util_mac.h" #endif #if defined(OS_POSIX) diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc index 351eaa5..c48dbe4 100644 --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc @@ -9,7 +9,6 @@ #include <map> #include <set> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/singleton.h" #include "base/string_number_conversions.h" @@ -19,6 +18,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace about_flags { diff --git a/chrome/browser/accessibility/browser_accessibility_cocoa.mm b/chrome/browser/accessibility/browser_accessibility_cocoa.mm index b10a2eb..d3d77f7 100644 --- a/chrome/browser/accessibility/browser_accessibility_cocoa.mm +++ b/chrome/browser/accessibility/browser_accessibility_cocoa.mm @@ -6,12 +6,12 @@ #import "chrome/browser/accessibility/browser_accessibility_cocoa.h" -#include "app/l10n_util_mac.h" #include "base/string16.h" #include "base/sys_string_conversions.h" #include "chrome/browser/renderer_host/render_widget_host_view_mac.h" #include "grit/webkit_strings.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc index 9fbd160..85f59a3 100644 --- a/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc +++ b/chrome/browser/accessibility/browser_views_accessibility_browsertest.cc @@ -4,7 +4,6 @@ #include <oleacc.h> -#include "app/l10n_util.h" #include "base/scoped_comptr_win.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_window.h" @@ -18,6 +17,7 @@ #include "chrome/test/ui_test_utils.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/accessibility/view_accessibility.h" #include "views/widget/root_view.h" #include "views/widget/widget_win.h" diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc index 58f18ed..4085d47 100644 --- a/chrome/browser/alternate_nav_url_fetcher.cc +++ b/chrome/browser/alternate_nav_url_fetcher.cc @@ -4,7 +4,6 @@ #include "chrome/browser/alternate_nav_url_fetcher.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/intranet_redirect_detector.h" #include "chrome/browser/profiles/profile.h" @@ -16,6 +15,7 @@ #include "grit/theme_resources.h" #include "net/base/registry_controlled_domain.h" #include "net/url_request/url_request.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" AlternateNavURLFetcher::AlternateNavURLFetcher( diff --git a/chrome/browser/app_controller_mac.mm b/chrome/browser/app_controller_mac.mm index 2654b14..058ed16 100644 --- a/chrome/browser/app_controller_mac.mm +++ b/chrome/browser/app_controller_mac.mm @@ -4,8 +4,6 @@ #import "chrome/browser/app_controller_mac.h" -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" #include "base/auto_reset.h" #include "base/command_line.h" #include "base/file_path.h" @@ -55,6 +53,8 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" // 10.6 adds a public API for the Spotlight-backed search menu item in the Help // menu. Provide the declaration so it can be called below when building with diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc index e2f3de2..ab47a12 100644 --- a/chrome/browser/autocomplete/autocomplete.cc +++ b/chrome/browser/autocomplete/autocomplete.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/command_line.h" #include "base/i18n/number_formatting.h" @@ -37,6 +36,7 @@ #include "net/base/net_util.h" #include "net/base/registry_controlled_domain.h" #include "net/url_request/url_request.h" +#include "ui/base/l10n/l10n_util.h" using base::TimeDelta; diff --git a/chrome/browser/autocomplete/autocomplete_accessibility.cc b/chrome/browser/autocomplete/autocomplete_accessibility.cc index 747d8fe..bcf087dd 100644 --- a/chrome/browser/autocomplete/autocomplete_accessibility.cc +++ b/chrome/browser/autocomplete/autocomplete_accessibility.cc @@ -4,10 +4,10 @@ #include "chrome/browser/autocomplete/autocomplete_accessibility.h" -#include "app/l10n_util.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/accessibility/view_accessibility.h" #include "views/view.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc index 07e79f5..9a6b947 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_gtk.cc @@ -9,7 +9,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -36,6 +35,7 @@ #include "net/base/escape.h" #include "third_party/undoview/undo_view.h" #include "ui/base/animation/multi_animation.h" +#include "ui/base/l10n/l10n_util.h" #if defined(TOOLKIT_VIEWS) #include "chrome/browser/autocomplete/autocomplete_edit_view_views.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc index f4935e0..e22b1d8 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_views.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_views.cc @@ -4,7 +4,6 @@ #include "chrome/browser/autocomplete/autocomplete_edit_view_views.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -21,6 +20,7 @@ #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "net/base/escape.h" +#include "ui/base/l10n/l10n_util.h" #include "views/border.h" #include "views/fill_layout.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 9e2a820..3af9ed8 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -11,8 +11,6 @@ #include <richedit.h> #include <textserv.h> -#include "app/l10n_util.h" -#include "app/l10n_util_win.h" #include "app/win/iat_patch_function.h" #include "app/win/win_util.h" #include "base/auto_reset.h" @@ -50,6 +48,8 @@ #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/dragdrop/os_exchange_data_provider_win.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_win.h" #include "views/drag_utils.h" #include "views/focus/focus_util_win.h" #include "views/widget/widget.h" diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc index 2225456..b690363 100644 --- a/chrome/browser/autocomplete/keyword_provider.cc +++ b/chrome/browser/autocomplete/keyword_provider.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <vector> -#include "app/l10n_util.h" #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_match.h" @@ -21,6 +20,7 @@ #include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" // Helper functor for Start(), for ending keyword mode unless explicitly told // otherwise. diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index fa162d3..32f58e5 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <cmath> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/i18n/icu_string_conversions.h" #include "base/message_loop.h" @@ -31,6 +30,7 @@ #include "net/base/escape.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request_status.h" +#include "ui/base/l10n/l10n_util.h" using base::Time; using base::TimeDelta; diff --git a/chrome/browser/autofill/address_field.cc b/chrome/browser/autofill/address_field.cc index b2bef04..e379c74 100644 --- a/chrome/browser/autofill/address_field.cc +++ b/chrome/browser/autofill/address_field.cc @@ -4,7 +4,6 @@ #include "chrome/browser/autofill/address_field.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string16.h" @@ -12,6 +11,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_field.h" #include "grit/autofill_resources.h" +#include "ui/base/l10n/l10n_util.h" bool AddressField::GetFieldInfo(FieldTypeMap* field_type_map) const { AutoFillFieldType address_company; diff --git a/chrome/browser/autofill/autofill_address_model_mac.mm b/chrome/browser/autofill/autofill_address_model_mac.mm index d94c06e..3b1623b 100644 --- a/chrome/browser/autofill/autofill_address_model_mac.mm +++ b/chrome/browser/autofill/autofill_address_model_mac.mm @@ -3,10 +3,10 @@ // found in the LICENSE file. #import "chrome/browser/autofill/autofill_address_model_mac.h" -#include "app/l10n_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/autofill/autofill_profile.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" @implementation AutoFillAddressModel diff --git a/chrome/browser/autofill/autofill_address_sheet_controller_mac.mm b/chrome/browser/autofill/autofill_address_sheet_controller_mac.mm index d2f6938..a2c55cf 100644 --- a/chrome/browser/autofill/autofill_address_sheet_controller_mac.mm +++ b/chrome/browser/autofill/autofill_address_sheet_controller_mac.mm @@ -4,13 +4,13 @@ #import "chrome/browser/autofill/autofill_address_sheet_controller_mac.h" -#include "app/l10n_util.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #import "chrome/browser/autofill/autofill_address_model_mac.h" #import "chrome/browser/autofill/autofill_dialog_controller_mac.h" #include "chrome/browser/autofill/autofill_profile.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" @implementation AutoFillAddressSheetController diff --git a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc index e3d29ac..d143cfd 100644 --- a/chrome/browser/autofill/autofill_cc_infobar_delegate.cc +++ b/chrome/browser/autofill/autofill_cc_infobar_delegate.cc @@ -4,13 +4,13 @@ #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h" -#include "app/l10n_util.h" #include "base/metrics/histogram.h" #include "chrome/browser/autofill/autofill_cc_infobar.h" #include "chrome/browser/autofill/autofill_manager.h" #include "chrome/browser/browser_list.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" AutoFillCCInfoBarDelegate::AutoFillCCInfoBarDelegate(TabContents* tab_contents, diff --git a/chrome/browser/autofill/autofill_credit_card_model_mac.mm b/chrome/browser/autofill/autofill_credit_card_model_mac.mm index 1eec96f..6c939ca 100644 --- a/chrome/browser/autofill/autofill_credit_card_model_mac.mm +++ b/chrome/browser/autofill/autofill_credit_card_model_mac.mm @@ -3,10 +3,10 @@ // found in the LICENSE file. #import "chrome/browser/autofill/autofill_credit_card_model_mac.h" -#include "app/l10n_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/autofill/credit_card.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" @implementation AutoFillCreditCardModel diff --git a/chrome/browser/autofill/autofill_credit_card_sheet_controller_mac.mm b/chrome/browser/autofill/autofill_credit_card_sheet_controller_mac.mm index ae72117..dd00cd5 100644 --- a/chrome/browser/autofill/autofill_credit_card_sheet_controller_mac.mm +++ b/chrome/browser/autofill/autofill_credit_card_sheet_controller_mac.mm @@ -4,13 +4,13 @@ #import "chrome/browser/autofill/autofill_credit_card_sheet_controller_mac.h" -#include "app/l10n_util.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #import "chrome/browser/autofill/autofill_credit_card_model_mac.h" #import "chrome/browser/autofill/autofill_dialog_controller_mac.h" #include "chrome/browser/autofill/credit_card.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" // Interface exposed for unit testing. @implementation AutoFillCreditCardSheetController (ExposedForUnitTests) diff --git a/chrome/browser/autofill/autofill_dialog_controller_mac.mm b/chrome/browser/autofill/autofill_dialog_controller_mac.mm index a20e534..039d137 100644 --- a/chrome/browser/autofill/autofill_dialog_controller_mac.mm +++ b/chrome/browser/autofill/autofill_dialog_controller_mac.mm @@ -3,7 +3,6 @@ // found in the LICENSE file. #import "chrome/browser/autofill/autofill_dialog_controller_mac.h" -#include "app/l10n_util.h" #include "base/lazy_instance.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" @@ -25,6 +24,7 @@ #include "grit/generated_resources.h" #include "grit/app_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/autofill/autofill_dialog_gtk.cc b/chrome/browser/autofill/autofill_dialog_gtk.cc index 80ce045..936306d 100644 --- a/chrome/browser/autofill/autofill_dialog_gtk.cc +++ b/chrome/browser/autofill/autofill_dialog_gtk.cc @@ -10,7 +10,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" @@ -38,6 +37,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/base/l10n/l10n_util.h" // Shows the editor for adding/editing an AutoFillProfile. If // |auto_fill_profile| is NULL, a new AutoFillProfile should be created. diff --git a/chrome/browser/autofill/autofill_editor_gtk.cc b/chrome/browser/autofill/autofill_editor_gtk.cc index 7d8281f..3c05cf5 100644 --- a/chrome/browser/autofill/autofill_editor_gtk.cc +++ b/chrome/browser/autofill/autofill_editor_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/string_util.h" #include "base/task.h" @@ -22,6 +21,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/autofill/autofill_manager.cc b/chrome/browser/autofill/autofill_manager.cc index 11e6d9e..b7016a8 100644 --- a/chrome/browser/autofill/autofill_manager.cc +++ b/chrome/browser/autofill/autofill_manager.cc @@ -9,7 +9,6 @@ #include <set> #include <utility> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/command_line.h" #include "base/string16.h" @@ -35,6 +34,7 @@ #include "chrome/common/render_messages.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/form_data.h" #include "webkit/glue/form_field.h" diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc index c66f6b6..9a3aa8f5 100644 --- a/chrome/browser/autofill/autofill_manager_unittest.cc +++ b/chrome/browser/autofill/autofill_manager_unittest.cc @@ -4,7 +4,6 @@ #include <vector> -#include "app/l10n_util.h" #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/scoped_vector.h" @@ -31,6 +30,7 @@ #include "grit/generated_resources.h" #include "ipc/ipc_test_sink.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/form_data.h" #include "webkit/glue/form_field.h" diff --git a/chrome/browser/autofill/autofill_profile.cc b/chrome/browser/autofill/autofill_profile.cc index 4426ec2..1ec7b30 100644 --- a/chrome/browser/autofill/autofill_profile.cc +++ b/chrome/browser/autofill/autofill_profile.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <set> -#include "app/l10n_util.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/address.h" @@ -18,6 +17,7 @@ #include "chrome/browser/autofill/home_phone_number.h" #include "chrome/common/guid.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/autofill/credit_card.cc b/chrome/browser/autofill/credit_card.cc index 115f2e8..6296eba 100644 --- a/chrome/browser/autofill/credit_card.cc +++ b/chrome/browser/autofill/credit_card.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/string_util.h" #include "base/string_number_conversions.h" @@ -16,6 +15,7 @@ #include "chrome/browser/autofill/field_types.h" #include "chrome/common/guid.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/autofill/credit_card_field.cc b/chrome/browser/autofill/credit_card_field.cc index 3a51b6f..7837463 100644 --- a/chrome/browser/autofill/credit_card_field.cc +++ b/chrome/browser/autofill/credit_card_field.cc @@ -4,12 +4,12 @@ #include "chrome/browser/autofill/credit_card_field.h" -#include "app/l10n_util.h" #include "base/scoped_ptr.h" #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_field.h" #include "grit/autofill_resources.h" +#include "ui/base/l10n/l10n_util.h" bool CreditCardField::GetFieldInfo(FieldTypeMap* field_type_map) const { bool ok = Add(field_type_map, number_, AutoFillType(CREDIT_CARD_NUMBER)); diff --git a/chrome/browser/autofill/fax_field.cc b/chrome/browser/autofill/fax_field.cc index 8475730..7c948d1 100644 --- a/chrome/browser/autofill/fax_field.cc +++ b/chrome/browser/autofill/fax_field.cc @@ -4,12 +4,12 @@ #include "chrome/browser/autofill/fax_field.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_field.h" #include "grit/autofill_resources.h" +#include "ui/base/l10n/l10n_util.h" // static FaxField* FaxField::Parse(std::vector<AutoFillField*>::const_iterator* iter) { diff --git a/chrome/browser/autofill/form_field.cc b/chrome/browser/autofill/form_field.cc index 9e9a8fc..b6aa754 100644 --- a/chrome/browser/autofill/form_field.cc +++ b/chrome/browser/autofill/form_field.cc @@ -4,7 +4,6 @@ #include "chrome/browser/autofill/form_field.h" -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/address_field.h" @@ -16,6 +15,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebRegularExpression.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" #include "grit/autofill_resources.h" +#include "ui/base/l10n/l10n_util.h" // Field names from the ECML specification; see RFC 3106. We've // made these names lowercase since we convert labels and field names to diff --git a/chrome/browser/autofill/name_field.cc b/chrome/browser/autofill/name_field.cc index 8a83ff7..11cd534 100644 --- a/chrome/browser/autofill/name_field.cc +++ b/chrome/browser/autofill/name_field.cc @@ -4,13 +4,13 @@ #include "chrome/browser/autofill/name_field.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_type.h" #include "grit/autofill_resources.h" +#include "ui/base/l10n/l10n_util.h" NameField* NameField::Parse(std::vector<AutoFillField*>::const_iterator* iter, bool is_ecml) { diff --git a/chrome/browser/autofill/personal_data_manager_mac.mm b/chrome/browser/autofill/personal_data_manager_mac.mm index d6ddf1b..a081122 100644 --- a/chrome/browser/autofill/personal_data_manager_mac.mm +++ b/chrome/browser/autofill/personal_data_manager_mac.mm @@ -6,7 +6,6 @@ #import <AddressBook/AddressBook.h> -#include "app/l10n_util_mac.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/scoped_vector.h" @@ -15,6 +14,7 @@ #include "chrome/browser/autofill/phone_number.h" #include "chrome/common/guid.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/chrome/browser/autofill/phone_field.cc b/chrome/browser/autofill/phone_field.cc index 083a8dc..7ce6c7c 100644 --- a/chrome/browser/autofill/phone_field.cc +++ b/chrome/browser/autofill/phone_field.cc @@ -4,7 +4,6 @@ #include "chrome/browser/autofill/phone_field.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string16.h" @@ -12,6 +11,7 @@ #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_field.h" #include "grit/autofill_resources.h" +#include "ui/base/l10n/l10n_util.h" // static PhoneField* PhoneField::Parse(std::vector<AutoFillField*>::const_iterator* iter, diff --git a/chrome/browser/automation/automation_provider_mac.mm b/chrome/browser/automation/automation_provider_mac.mm index 8583a46..a5deccf 100644 --- a/chrome/browser/automation/automation_provider_mac.mm +++ b/chrome/browser/automation/automation_provider_mac.mm @@ -6,8 +6,6 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" #include "base/sys_string_conversions.h" #include "chrome/browser/automation/automation_browser_tracker.h" #include "chrome/browser/automation/automation_window_tracker.h" @@ -18,6 +16,8 @@ #include "gfx/point.h" #include "gfx/rect.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" void AutomationProvider::PrintAsync(int tab_handle) { NOTIMPLEMENTED(); diff --git a/chrome/browser/automation/testing_automation_provider_mac.mm b/chrome/browser/automation/testing_automation_provider_mac.mm index b4fabd0..d8cbe79 100644 --- a/chrome/browser/automation/testing_automation_provider_mac.mm +++ b/chrome/browser/automation/testing_automation_provider_mac.mm @@ -6,8 +6,7 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" +#include "ui/base/l10n/l10n_util.h" #include "base/logging.h" #include "base/sys_string_conversions.h" #include "chrome/browser/automation/automation_browser_tracker.h" @@ -16,6 +15,7 @@ #include "chrome/browser/ui/cocoa/tabs/tab_window_controller.h" #include "chrome/browser/ui/view_ids.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" void TestingAutomationProvider::ActivateWindow(int handle) { NOTIMPLEMENTED(); diff --git a/chrome/browser/background_application_list_model.cc b/chrome/browser/background_application_list_model.cc index 564e8d5..83d1e27 100644 --- a/chrome/browser/background_application_list_model.cc +++ b/chrome/browser/background_application_list_model.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <set> -#include "app/l10n_util_collator.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -21,6 +20,7 @@ #include "chrome/common/extensions/extension_resource.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" +#include "ui/base/l10n/l10n_util_collator.h" class ExtensionNameComparator { public: diff --git a/chrome/browser/background_mode_manager.cc b/chrome/browser/background_mode_manager.cc index 60b0f43..620eee3 100644 --- a/chrome/browser/background_mode_manager.cc +++ b/chrome/browser/background_mode_manager.cc @@ -4,7 +4,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/logging.h" @@ -26,6 +25,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" void BackgroundModeManager::OnApplicationDataChanged( diff --git a/chrome/browser/background_mode_manager_chromeos.cc b/chrome/browser/background_mode_manager_chromeos.cc index 8439f18..d01c70d 100644 --- a/chrome/browser/background_mode_manager_chromeos.cc +++ b/chrome/browser/background_mode_manager_chromeos.cc @@ -4,8 +4,8 @@ #include "chrome/browser/background_mode_manager.h" -#include "app/l10n_util.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" void BackgroundModeManager::EnableLaunchOnStartup(bool should_launch) { NOTREACHED(); diff --git a/chrome/browser/background_mode_manager_linux.cc b/chrome/browser/background_mode_manager_linux.cc index c7022a6..4f4b5707 100644 --- a/chrome/browser/background_mode_manager_linux.cc +++ b/chrome/browser/background_mode_manager_linux.cc @@ -4,7 +4,6 @@ #include <unistd.h> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/environment.h" #include "base/file_path.h" @@ -19,6 +18,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/chrome_version_info.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/background_mode_manager_mac.mm b/chrome/browser/background_mode_manager_mac.mm index 40b958d..02e93f4 100644 --- a/chrome/browser/background_mode_manager_mac.mm +++ b/chrome/browser/background_mode_manager_mac.mm @@ -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/mac/mac_util.h" #include "chrome/browser/background_mode_manager.h" @@ -10,6 +9,7 @@ #include "chrome/common/app_mode_common_mac.h" #include "chrome/common/chrome_switches.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/background_mode_manager_win.cc b/chrome/browser/background_mode_manager_win.cc index 20d649c..a957493 100644 --- a/chrome/browser/background_mode_manager_win.cc +++ b/chrome/browser/background_mode_manager_win.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/base_paths.h" #include "base/command_line.h" #include "base/file_path.h" @@ -14,6 +13,7 @@ #include "chrome/browser/browser_thread.h" #include "chrome/common/chrome_switches.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc index 9b5be0f..d662c28 100644 --- a/chrome/browser/bookmarks/bookmark_codec.cc +++ b/chrome/browser/bookmarks/bookmark_codec.cc @@ -6,13 +6,13 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" using base::Time; diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc index 8eed100..c770315 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_controller.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_controller.cc @@ -4,7 +4,6 @@ #include "chrome/browser/bookmarks/bookmark_context_menu_controller.h" -#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/bookmarks/bookmark_editor.h" @@ -19,6 +18,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" BookmarkContextMenuController::BookmarkContextMenuController( gfx::NativeWindow parent_window, diff --git a/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc b/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc index a995c63..d5ae421 100644 --- a/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc +++ b/chrome/browser/bookmarks/bookmark_folder_editor_controller.cc @@ -4,12 +4,12 @@ #include "chrome/browser/bookmarks/bookmark_folder_editor_controller.h" -#include "app/l10n_util.h" #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/profiles/profile.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" BookmarkFolderEditorController::~BookmarkFolderEditorController() { if (model_) diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index 5095158..376fb69 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -4,7 +4,6 @@ #include "chrome/browser/bookmarks/bookmark_html_writer.h" -#include "app/l10n_util.h" #include "base/base64.h" #include "base/callback.h" #include "base/file_path.h" @@ -24,6 +23,7 @@ #include "net/base/escape.h" #include "net/base/file_stream.h" #include "net/base/net_errors.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc index 3a0bcbf..ecd2b2b 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc @@ -4,7 +4,6 @@ #include "testing/gtest/include/gtest/gtest.h" -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/message_loop.h" #include "base/path_service.h" @@ -21,6 +20,7 @@ #include "gfx/codec/png_codec.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/bookmarks/bookmark_index.cc b/chrome/browser/bookmarks/bookmark_index.cc index c75c5fe..c247cb5 100644 --- a/chrome/browser/bookmarks/bookmark_index.cc +++ b/chrome/browser/bookmarks/bookmark_index.cc @@ -8,13 +8,13 @@ #include <iterator> #include <list> -#include "app/l10n_util.h" #include "base/string16.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "chrome/browser/history/history_database.h" #include "chrome/browser/history/query_parser.h" #include "chrome/browser/profiles/profile.h" +#include "ui/base/l10n/l10n_util.h" // Used when finding the set of bookmarks that match a query. Each match // represents a set of terms (as an interator into the Index) matching the diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index 31b99ce..f9ec89d 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -7,8 +7,6 @@ #include <algorithm> #include <functional> -#include "app/l10n_util.h" -#include "app/l10n_util_collator.h" #include "base/callback.h" #include "base/scoped_vector.h" #include "build/build_config.h" @@ -21,6 +19,8 @@ #include "chrome/common/notification_service.h" #include "gfx/codec/png_codec.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_collator.h" using base::Time; diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 55abf7e..0117b65 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -6,7 +6,6 @@ #include <utility> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/file_path.h" #include "base/string16.h" @@ -34,6 +33,7 @@ #include "grit/generated_resources.h" #include "net/base/net_util.h" #include "ui/base/dragdrop/drag_drop_types.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/tree_node_iterator.h" #include "views/event.h" diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc index 7990de6..172e779 100644 --- a/chrome/browser/bookmarks/recently_used_folders_combo_model.cc +++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.cc @@ -4,9 +4,9 @@ #include "chrome/browser/bookmarks/recently_used_folders_combo_model.h" -#include "app/l10n_util.h" #include "chrome/browser/bookmarks/bookmark_utils.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 295189f..f41cebc 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/command_line.h" #include "base/i18n/number_formatting.h" @@ -54,6 +53,7 @@ #include "grit/locale_settings.h" #include "webkit/glue/webkit_glue.h" #include "net/base/escape.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #ifdef CHROME_V8 #include "v8/include/v8.h" diff --git a/chrome/browser/browser_browsertest.cc b/chrome/browser/browser_browsertest.cc index 81800dd..55a2a84 100644 --- a/chrome/browser/browser_browsertest.cc +++ b/chrome/browser/browser_browsertest.cc @@ -4,7 +4,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "base/file_path.h" #include "base/sys_info.h" @@ -39,6 +38,7 @@ #include "grit/generated_resources.h" #include "net/base/mock_host_resolver.h" #include "net/test/test_server.h" +#include "ui/base/l10n/l10n_util.h" #if defined(OS_WIN) #include "base/i18n/rtl.h" diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index a6866ea..dc2b84a 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -8,7 +8,7 @@ #include <string> #include <vector> -#include "app/l10n_util.h" +#include "ui/base/l10n/l10n_util.h" #include "base/at_exit.h" #include "base/command_line.h" #include "base/debug/trace_event.h" @@ -130,7 +130,6 @@ #include <shellapi.h> #include <windows.h> -#include "app/l10n_util_win.h" #include "app/win/scoped_com_initializer.h" #include "chrome/browser/browser_trial.h" #include "chrome/browser/metrics/user_metrics.h" @@ -146,6 +145,7 @@ #include "net/base/sdch_manager.h" #include "printing/printed_document.h" #include "sandbox/src/sandbox.h" +#include "ui/base/l10n/l10n_util_win.h" #endif // defined(OS_WIN) #if defined(OS_MACOSX) diff --git a/chrome/browser/browser_main_mac.mm b/chrome/browser/browser_main_mac.mm index 57b33e5..cd359a9 100644 --- a/chrome/browser/browser_main_mac.mm +++ b/chrome/browser/browser_main_mac.mm @@ -7,7 +7,6 @@ #import <Cocoa/Cocoa.h> #include "app/app_switches.h" -#include "app/l10n_util_mac.h" #include "base/command_line.h" #include "base/debug/debugger.h" #include "base/file_path.h" @@ -26,6 +25,7 @@ #include "chrome/common/main_function_params.h" #include "chrome/common/result_codes.h" #include "net/socket/ssl_client_socket_mac_factory.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" void DidEndMainMessageLoop() { diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index cf8a36e..56b20a4 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -10,8 +10,6 @@ #include <algorithm> -#include "app/l10n_util.h" -#include "app/l10n_util_win.h" #include "app/win/win_util.h" #include "base/command_line.h" #include "base/environment.h" @@ -37,6 +35,8 @@ #include "grit/generated_resources.h" #include "net/base/winsock_init.h" #include "net/socket/ssl_client_socket_nss_factory.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_win.h" #include "views/focus/accelerator_handler.h" #include "views/window/window.h" diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 44730a1..cc62f0c 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -6,7 +6,6 @@ #include <map> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/path_service.h" @@ -62,6 +61,7 @@ #include "chrome/installer/util/google_update_constants.h" #include "ipc/ipc_logging.h" #include "ui/base/clipboard/clipboard.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/database/database_tracker.h" #if defined(OS_WIN) diff --git a/chrome/browser/bug_report_util.cc b/chrome/browser/bug_report_util.cc index aae584e..c02bc7d 100644 --- a/chrome/browser/bug_report_util.cc +++ b/chrome/browser/bug_report_util.cc @@ -7,7 +7,6 @@ #include <sstream> #include <string> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/file_version_info.h" #include "base/file_util.h" @@ -27,6 +26,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/url_request/url_request_status.h" +#include "ui/base/l10n/l10n_util.h" #include "unicode/locid.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index 4b0f92f..95134da 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -7,8 +7,6 @@ #include <map> #include <set> -#include "app/l10n_util.h" -#include "app/l10n_util_collator.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string_tokenizer.h" @@ -16,6 +14,8 @@ #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_collator.h" #include "unicode/ucnv.h" namespace { 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 { diff --git a/chrome/browser/content_exceptions_table_model.cc b/chrome/browser/content_exceptions_table_model.cc index 4fae85a..8383c2f 100644 --- a/chrome/browser/content_exceptions_table_model.cc +++ b/chrome/browser/content_exceptions_table_model.cc @@ -4,10 +4,10 @@ #include "chrome/browser/content_exceptions_table_model.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" ContentExceptionsTableModel::ContentExceptionsTableModel( diff --git a/chrome/browser/content_setting_bubble_model.cc b/chrome/browser/content_setting_bubble_model.cc index 10eabfb..c6f7a8e 100644 --- a/chrome/browser/content_setting_bubble_model.cc +++ b/chrome/browser/content_setting_bubble_model.cc @@ -4,7 +4,6 @@ #include "chrome/browser/content_setting_bubble_model.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/blocked_content_container.h" @@ -21,6 +20,7 @@ #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" class ContentSettingTitleAndLinkModel : public ContentSettingBubbleModel { public: diff --git a/chrome/browser/content_setting_combo_model.cc b/chrome/browser/content_setting_combo_model.cc index 3606587..8519ecc 100644 --- a/chrome/browser/content_setting_combo_model.cc +++ b/chrome/browser/content_setting_combo_model.cc @@ -4,11 +4,11 @@ #include "chrome/browser/content_setting_combo_model.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/string16.h" #include "chrome/common/chrome_switches.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/content_setting_image_model.cc b/chrome/browser/content_setting_image_model.cc index 87365db..e67f721 100644 --- a/chrome/browser/content_setting_image_model.cc +++ b/chrome/browser/content_setting_image_model.cc @@ -4,13 +4,13 @@ #include "chrome/browser/content_setting_image_model.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" class ContentSettingBlockedImageModel : public ContentSettingImageModel { public: diff --git a/chrome/browser/cookies_tree_model.cc b/chrome/browser/cookies_tree_model.cc index 4618549..5395bcd 100644 --- a/chrome/browser/cookies_tree_model.cc +++ b/chrome/browser/cookies_tree_model.cc @@ -8,7 +8,6 @@ #include <functional> #include <vector> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/linked_ptr.h" #include "base/string_util.h" @@ -22,6 +21,7 @@ #include "net/base/registry_controlled_domain.h" #include "net/url_request/url_request_context.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" static const char kFileOriginNodeName[] = "file://"; diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc index b5a0269..e365760 100644 --- a/chrome/browser/custom_home_pages_table_model.cc +++ b/chrome/browser/custom_home_pages_table_model.cc @@ -4,7 +4,6 @@ #include "chrome/browser/custom_home_pages_table_model.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -20,6 +19,7 @@ #include "grit/generated_resources.h" #include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/default_encoding_combo_model.cc b/chrome/browser/default_encoding_combo_model.cc index 22746ac..4fdb87a 100644 --- a/chrome/browser/default_encoding_combo_model.cc +++ b/chrome/browser/default_encoding_combo_model.cc @@ -4,13 +4,13 @@ #include "chrome/browser/default_encoding_combo_model.h" -#include "app/l10n_util.h" -#include "app/l10n_util_collator.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/pref_names.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_collator.h" DefaultEncodingComboboxModel::DefaultEncodingComboboxModel() { // Initialize the vector of all sorted encodings according to current diff --git a/chrome/browser/dom_ui/bug_report_ui.cc b/chrome/browser/dom_ui/bug_report_ui.cc index 2dc2a80..9fd907c 100644 --- a/chrome/browser/dom_ui/bug_report_ui.cc +++ b/chrome/browser/dom_ui/bug_report_ui.cc @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/logging.h" #include "base/message_loop.h" @@ -34,6 +33,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" #if defined(USE_X11) diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc index 8acd19f..a1075ae 100644 --- a/chrome/browser/dom_ui/chrome_url_data_manager.cc +++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/chrome_url_data_manager.h" -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" @@ -33,6 +32,7 @@ #include "net/url_request/url_request.h" #include "net/url_request/url_request_file_job.h" #include "net/url_request/url_request_job.h" +#include "ui/base/l10n/l10n_util.h" // URLRequestChromeJob is a net::URLRequestJob that manages running // chrome-internal resource requests asynchronously. diff --git a/chrome/browser/dom_ui/conflicts_ui.cc b/chrome/browser/dom_ui/conflicts_ui.cc index 82745de..19d78f4 100644 --- a/chrome/browser/dom_ui/conflicts_ui.cc +++ b/chrome/browser/dom_ui/conflicts_ui.cc @@ -8,7 +8,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -25,6 +24,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" namespace { diff --git a/chrome/browser/dom_ui/downloads_ui.cc b/chrome/browser/dom_ui/downloads_ui.cc index 527ca90..63b1b153 100644 --- a/chrome/browser/dom_ui/downloads_ui.cc +++ b/chrome/browser/dom_ui/downloads_ui.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/downloads_ui.h" -#include "app/l10n_util.h" #include "base/singleton.h" #include "base/string_piece.h" #include "base/threading/thread.h" @@ -20,6 +19,7 @@ #include "grit/browser_resources.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 { diff --git a/chrome/browser/dom_ui/filebrowse_ui.cc b/chrome/browser/dom_ui/filebrowse_ui.cc index dfc0fd6..473bb37 100644 --- a/chrome/browser/dom_ui/filebrowse_ui.cc +++ b/chrome/browser/dom_ui/filebrowse_ui.cc @@ -4,7 +4,6 @@ #include "chrome/browser/dom_ui/filebrowse_ui.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/command_line.h" #include "base/file_util.h" @@ -47,6 +46,7 @@ #include "grit/locale_settings.h" #include "net/base/escape.h" #include "net/url_request/url_request_file_job.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #if defined(OS_CHROMEOS) diff --git a/chrome/browser/dom_ui/flags_ui.cc b/chrome/browser/dom_ui/flags_ui.cc index ac76a8f..636cb76 100644 --- a/chrome/browser/dom_ui/flags_ui.cc +++ b/chrome/browser/dom_ui/flags_ui.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/singleton.h" #include "base/values.h" #include "chrome/browser/about_flags.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" namespace { diff --git a/chrome/browser/dom_ui/gpu_internals_ui.cc b/chrome/browser/dom_ui/gpu_internals_ui.cc index c5c5791..752a5f5 100644 --- a/chrome/browser/dom_ui/gpu_internals_ui.cc +++ b/chrome/browser/dom_ui/gpu_internals_ui.cc @@ -9,7 +9,6 @@ #include <utility> #include <vector> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/message_loop.h" @@ -38,6 +37,7 @@ #include "grit/browser_resources.h" #include "grit/generated_resources.h" #include "net/base/escape.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/dom_ui/history2_ui.cc b/chrome/browser/dom_ui/history2_ui.cc index 2847510..8d33325 100644 --- a/chrome/browser/dom_ui/history2_ui.cc +++ b/chrome/browser/dom_ui/history2_ui.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <set> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/i18n/time_formatting.h" #include "base/message_loop.h" @@ -39,6 +38,7 @@ #include "grit/locale_settings.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" // Maximum number of search results to return in a given search. We should diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index e9c5029..b0ad9f3 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <set> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/i18n/time_formatting.h" #include "base/message_loop.h" @@ -39,6 +38,7 @@ #include "grit/locale_settings.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" // Maximum number of search results to return in a given search. We should diff --git a/chrome/browser/dom_ui/most_visited_handler.cc b/chrome/browser/dom_ui/most_visited_handler.cc index 8f15379..880e318 100644 --- a/chrome/browser/dom_ui/most_visited_handler.cc +++ b/chrome/browser/dom_ui/most_visited_handler.cc @@ -6,7 +6,6 @@ #include <set> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/command_line.h" #include "base/md5.h" @@ -34,6 +33,7 @@ #include "grit/chromium_strings.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/net_internals_ui.cc b/chrome/browser/dom_ui/net_internals_ui.cc index 0cc5af5..403eb5e 100644 --- a/chrome/browser/dom_ui/net_internals_ui.cc +++ b/chrome/browser/dom_ui/net_internals_ui.cc @@ -9,7 +9,6 @@ #include <utility> #include <vector> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/message_loop.h" @@ -47,6 +46,7 @@ #include "net/http/http_network_session.h" #include "net/proxy/proxy_service.h" #include "net/url_request/url_request_context.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #ifdef OS_WIN diff --git a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc index 96ab9f9..cd45544 100644 --- a/chrome/browser/dom_ui/new_tab_page_sync_handler.cc +++ b/chrome/browser/dom_ui/new_tab_page_sync_handler.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/string_split.h" #include "base/string_util.h" @@ -19,6 +18,7 @@ #include "grit/generated_resources.h" #include "net/base/cookie_monster.h" #include "net/url_request/url_request_context.h" +#include "ui/base/l10n/l10n_util.h" // Default URL for the sync web interface. // diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index 681e979..bab6b51 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -8,7 +8,6 @@ #include <set> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/command_line.h" #include "base/i18n/rtl.h" @@ -46,6 +45,7 @@ #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/dom_ui/ntp_resource_cache.cc b/chrome/browser/dom_ui/ntp_resource_cache.cc index 9528d6d..b82cf3c 100644 --- a/chrome/browser/dom_ui/ntp_resource_cache.cc +++ b/chrome/browser/dom_ui/ntp_resource_cache.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <vector> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/ref_counted_memory.h" @@ -39,6 +38,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/animation/animation.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" 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() { } diff --git a/chrome/browser/dom_ui/plugins_ui.cc b/chrome/browser/dom_ui/plugins_ui.cc index 377dc98..6cb237e 100644 --- a/chrome/browser/dom_ui/plugins_ui.cc +++ b/chrome/browser/dom_ui/plugins_ui.cc @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/path_service.h" #include "base/singleton.h" @@ -31,6 +30,7 @@ #include "grit/browser_resources.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 "webkit/plugins/npapi/plugin_list.h" diff --git a/chrome/browser/dom_ui/print_preview_ui.cc b/chrome/browser/dom_ui/print_preview_ui.cc index 23f1052..5f9602f 100644 --- a/chrome/browser/dom_ui/print_preview_ui.cc +++ b/chrome/browser/dom_ui/print_preview_ui.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/singleton.h" #include "base/string_piece.h" @@ -21,6 +20,7 @@ #include "grit/browser_resources.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 { diff --git a/chrome/browser/dom_ui/print_preview_ui_uitest.cc b/chrome/browser/dom_ui/print_preview_ui_uitest.cc index 1c6b52a..33dd66e 100644 --- a/chrome/browser/dom_ui/print_preview_ui_uitest.cc +++ b/chrome/browser/dom_ui/print_preview_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/string16.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -11,8 +10,8 @@ #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/ui/ui_test.h" - #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/dom_ui/tips_handler.cc b/chrome/browser/dom_ui/tips_handler.cc index 411da1f..9601100 100644 --- a/chrome/browser/dom_ui/tips_handler.cc +++ b/chrome/browser/dom_ui/tips_handler.cc @@ -4,7 +4,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -17,6 +16,7 @@ #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" DOMMessageHandler* TipsHandler::Attach(DOMUI* dom_ui) { dom_ui_ = dom_ui; diff --git a/chrome/browser/download/download_item.cc b/chrome/browser/download/download_item.cc index c496361..cb753e8 100644 --- a/chrome/browser/download/download_item.cc +++ b/chrome/browser/download/download_item.cc @@ -4,7 +4,6 @@ #include "chrome/browser/download/download_item.h" -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/file_util.h" #include "base/format_macros.h" @@ -26,6 +25,7 @@ #include "chrome/browser/profiles/profile.h" #include "chrome/common/extensions/extension.h" #include "chrome/common/pref_names.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc index 68c1861..e7da0ec 100644 --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc @@ -4,7 +4,6 @@ #include "chrome/browser/download/download_item_model.h" -#include "app/l10n_util.h" #include "base/i18n/number_formatting.h" #include "base/i18n/rtl.h" #include "base/string16.h" @@ -13,6 +12,7 @@ #include "chrome/browser/download/save_package.h" #include "chrome/common/time_format.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" using base::TimeDelta; diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index 24acf1d..740177e 100644 --- a/chrome/browser/download/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -4,7 +4,6 @@ #include "chrome/browser/download/download_manager.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/file_util.h" #include "base/logging.h" @@ -44,6 +43,7 @@ #include "grit/theme_resources.h" #include "net/base/mime_util.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" DownloadManager::DownloadManager(DownloadStatusUpdater* status_updater) diff --git a/chrome/browser/download/download_request_infobar_delegate.cc b/chrome/browser/download/download_request_infobar_delegate.cc index 5d4b618..beb0d90 100644 --- a/chrome/browser/download/download_request_infobar_delegate.cc +++ b/chrome/browser/download/download_request_infobar_delegate.cc @@ -4,10 +4,10 @@ #include "chrome/browser/download/download_request_infobar_delegate.h" -#include "app/l10n_util.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" DownloadRequestInfoBarDelegate::DownloadRequestInfoBarDelegate( diff --git a/chrome/browser/download/download_shelf.cc b/chrome/browser/download/download_shelf.cc index f8cc58a..ce000f4 100644 --- a/chrome/browser/download/download_shelf.cc +++ b/chrome/browser/download/download_shelf.cc @@ -4,7 +4,6 @@ #include "chrome/browser/download/download_shelf.h" -#include "app/l10n_util.h" #include "base/file_util.h" #include "chrome/browser/dom_ui/downloads_ui.h" #include "chrome/browser/download/download_item.h" @@ -14,6 +13,7 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" // DownloadShelfContextMenu ---------------------------------------------------- diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index 61574d3..c958213 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -11,7 +11,6 @@ #endif #include <string> -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/i18n/rtl.h" #include "base/i18n/time_formatting.h" @@ -52,6 +51,7 @@ #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkPath.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #if defined(TOOLKIT_VIEWS) diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc index fe52332..f7833d5 100644 --- a/chrome/browser/download/save_package.cc +++ b/chrome/browser/download/save_package.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/i18n/file_util_icu.h" @@ -51,6 +50,7 @@ #include "net/base/net_util.h" #include "net/url_request/url_request_context.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPageSerializerClient.h" +#include "ui/base/l10n/l10n_util.h" using base::Time; using WebKit::WebPageSerializerClient; diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index 542b28c..acfed88 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -7,7 +7,6 @@ #include <Tlhelp32.h> #include <wintrust.h> -#include "app/l10n_util.h" #include "app/win/win_util.h" #include "base/command_line.h" #include "base/environment.h" @@ -28,6 +27,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" // The period of time (in milliseconds) to wait until checking to see if any // incompatible modules exist. diff --git a/chrome/browser/extensions/crashed_extension_infobar.cc b/chrome/browser/extensions/crashed_extension_infobar.cc index dc527a8..3e88d28 100644 --- a/chrome/browser/extensions/crashed_extension_infobar.cc +++ b/chrome/browser/extensions/crashed_extension_infobar.cc @@ -4,13 +4,13 @@ #include "chrome/browser/extensions/crashed_extension_infobar.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/common/extensions/extension.h" #include "grit/browser_resources.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" CrashedExtensionInfoBarDelegate::CrashedExtensionInfoBarDelegate( diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index 4becbdd..a1a001a 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -6,7 +6,6 @@ #include <set> -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/lazy_instance.h" #include "base/path_service.h" @@ -35,6 +34,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/extensions/extension_bookmark_manager_api.cc b/chrome/browser/extensions/extension_bookmark_manager_api.cc index 67963b2..2edf970 100644 --- a/chrome/browser/extensions/extension_bookmark_manager_api.cc +++ b/chrome/browser/extensions/extension_bookmark_manager_api.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/l10n_util.h" #include "base/json/json_writer.h" #include "base/string_number_conversions.h" #include "base/values.h" @@ -22,6 +21,7 @@ #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace keys = extension_bookmarks_module_constants; diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index 8bd68a2..a211071 100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc @@ -7,7 +7,6 @@ #include <vector> #include <string> -#include "app/l10n_util.h" #include "base/crypto/rsa_private_key.h" #include "base/crypto/signature_creator.h" #include "base/file_util.h" @@ -19,6 +18,7 @@ #include "chrome/common/extensions/extension_file_util.h" #include "chrome/common/zip.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { const int kRSAKeySize = 1024; diff --git a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc index a60ecf2..7005adb 100644 --- a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc +++ b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/extension_service.h" @@ -19,6 +18,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" // ExtensionDisabledDialogDelegate -------------------------------------------- diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc index 92ce3d0..09fe9e6 100644 --- a/chrome/browser/extensions/extension_host.cc +++ b/chrome/browser/extensions/extension_host.cc @@ -6,7 +6,6 @@ #include <list> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/singleton.h" #include "base/metrics/histogram.h" @@ -47,6 +46,7 @@ #include "grit/browser_resources.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 "webkit/glue/context_menu.h" diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc index ab496f5..0ab5692 100644 --- a/chrome/browser/extensions/extension_install_ui.cc +++ b/chrome/browser/extensions/extension_install_ui.cc @@ -6,7 +6,6 @@ #include <map> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/i18n/rtl.h" @@ -30,6 +29,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" #if defined(OS_MACOSX) diff --git a/chrome/browser/extensions/extension_menu_manager.cc b/chrome/browser/extensions/extension_menu_manager.cc index 0d3c891..37fd123 100644 --- a/chrome/browser/extensions/extension_menu_manager.cc +++ b/chrome/browser/extensions/extension_menu_manager.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/string_util.h" @@ -19,6 +18,7 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/notification_service.h" #include "gfx/favicon_size.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/context_menu.h" ExtensionMenuItem::ExtensionMenuItem(const Id& id, diff --git a/chrome/browser/extensions/extension_webstore_private_api.cc b/chrome/browser/extensions/extension_webstore_private_api.cc index 32b7c65..46db494 100644 --- a/chrome/browser/extensions/extension_webstore_private_api.cc +++ b/chrome/browser/extensions/extension_webstore_private_api.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -28,6 +27,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/escape.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index 8ae7d3c..86b4e0d 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/base64.h" #include "base/callback.h" #include "base/file_util.h" @@ -53,6 +52,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/glue/image_decoder.h" diff --git a/chrome/browser/extensions/pack_extension_job.cc b/chrome/browser/extensions/pack_extension_job.cc index f4e2a03..41f87d2 100644 --- a/chrome/browser/extensions/pack_extension_job.cc +++ b/chrome/browser/extensions/pack_extension_job.cc @@ -4,7 +4,6 @@ #include "chrome/browser/extensions/pack_extension_job.h" -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" @@ -12,6 +11,7 @@ #include "chrome/browser/extensions/extension_creator.h" #include "chrome/common/chrome_constants.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" PackExtensionJob::PackExtensionJob(Client* client, const FilePath& root_directory, diff --git a/chrome/browser/extensions/sandboxed_extension_unpacker.cc b/chrome/browser/extensions/sandboxed_extension_unpacker.cc index c43b83d..df6ad6e 100644 --- a/chrome/browser/extensions/sandboxed_extension_unpacker.cc +++ b/chrome/browser/extensions/sandboxed_extension_unpacker.cc @@ -6,7 +6,6 @@ #include <set> -#include "app/l10n_util.h" #include "base/base64.h" #include "base/crypto/signature_verifier.h" #include "base/file_util.h" @@ -31,6 +30,7 @@ #include "gfx/codec/png_codec.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" const char SandboxedExtensionUnpacker::kExtensionHeaderMagic[] = "Cr24"; diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.cc b/chrome/browser/extensions/theme_installed_infobar_delegate.cc index 5289f66..402e108 100644 --- a/chrome/browser/extensions/theme_installed_infobar_delegate.cc +++ b/chrome/browser/extensions/theme_installed_infobar_delegate.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/browser/profiles/profile.h" @@ -16,6 +15,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" ThemeInstalledInfoBarDelegate::ThemeInstalledInfoBarDelegate( diff --git a/chrome/browser/external_tab_container_win.cc b/chrome/browser/external_tab_container_win.cc index a20e829..a13ee1f 100644 --- a/chrome/browser/external_tab_container_win.cc +++ b/chrome/browser/external_tab_container_win.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/debug/trace_event.h" #include "base/i18n/rtl.h" #include "base/logging.h" @@ -45,6 +44,7 @@ #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/view_prop.h" #include "views/grid_layout.h" #include "views/widget/root_view.h" diff --git a/chrome/browser/file_select_helper.cc b/chrome/browser/file_select_helper.cc index 1604b0d..9cab2ba 100644 --- a/chrome/browser/file_select_helper.cc +++ b/chrome/browser/file_select_helper.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/string_split.h" #include "base/string_util.h" @@ -21,6 +20,7 @@ #include "chrome/common/notification_source.h" #include "chrome/common/render_messages_params.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" FileSelectHelper::FileSelectHelper(Profile* profile) : profile_(profile), diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc index dfad247..985c4c8 100644 --- a/chrome/browser/first_run/first_run_win.cc +++ b/chrome/browser/first_run/first_run_win.cc @@ -11,8 +11,6 @@ #include <set> #include <sstream> -#include "app/app_switches.h" -#include "app/l10n_util.h" #include "base/environment.h" #include "base/file_util.h" #include "base/path_service.h" @@ -58,6 +56,7 @@ #include "views/widget/widget_win.h" #include "views/window/window.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/ui_base_switches.h" namespace { diff --git a/chrome/browser/geolocation/geolocation_exceptions_table_model.cc b/chrome/browser/geolocation/geolocation_exceptions_table_model.cc index c642657..df32cb7 100644 --- a/chrome/browser/geolocation/geolocation_exceptions_table_model.cc +++ b/chrome/browser/geolocation/geolocation_exceptions_table_model.cc @@ -4,12 +4,12 @@ #include "chrome/browser/geolocation/geolocation_exceptions_table_model.h" -#include "app/l10n_util.h" -#include "app/l10n_util_collator.h" +#include "ui/base/l10n/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/content_settings_helper.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_collator.h" #include "ui/base/models/table_model_observer.h" namespace { diff --git a/chrome/browser/geolocation/geolocation_permission_context.cc b/chrome/browser/geolocation/geolocation_permission_context.cc index 04c9c6e5..ff33fb7 100644 --- a/chrome/browser/geolocation/geolocation_permission_context.cc +++ b/chrome/browser/geolocation/geolocation_permission_context.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/extensions/extension_service.h" @@ -32,6 +31,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" // GeolocationInfoBarQueueController ------------------------------------------ diff --git a/chrome/browser/google/google_url_tracker.cc b/chrome/browser/google/google_url_tracker.cc index 0b35f8a..0c30969 100644 --- a/chrome/browser/google/google_url_tracker.cc +++ b/chrome/browser/google/google_url_tracker.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/string_util.h" @@ -23,6 +22,7 @@ #include "grit/generated_resources.h" #include "net/base/load_flags.h" #include "net/url_request/url_request_status.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/hang_monitor/hung_plugin_action.cc b/chrome/browser/hang_monitor/hung_plugin_action.cc index b71f822..b53914d 100644 --- a/chrome/browser/hang_monitor/hung_plugin_action.cc +++ b/chrome/browser/hang_monitor/hung_plugin_action.cc @@ -6,10 +6,10 @@ #include "chrome/browser/hang_monitor/hung_plugin_action.h" -#include "app/l10n_util.h" #include "chrome/browser/platform_util.h" #include "chrome/common/logging_chrome.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/win/hwnd_util.h" #include "webkit/plugins/npapi/webplugin_delegate_impl.h" diff --git a/chrome/browser/history/in_memory_url_index.cc b/chrome/browser/history/in_memory_url_index.cc index 62a22e6..d60f7e2 100644 --- a/chrome/browser/history/in_memory_url_index.cc +++ b/chrome/browser/history/in_memory_url_index.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <limits> -#include "app/l10n_util.h" #include "base/i18n/break_iterator.h" #include "base/string_util.h" #include "base/time.h" @@ -16,6 +15,7 @@ #include "chrome/browser/history/url_database.h" #include "net/base/escape.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" #include "unicode/utypes.h" // for int32_t using base::Time; diff --git a/chrome/browser/history/query_parser.cc b/chrome/browser/history/query_parser.cc index 12ecc29..1037b6c 100644 --- a/chrome/browser/history/query_parser.cc +++ b/chrome/browser/history/query_parser.cc @@ -6,12 +6,12 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/i18n/break_iterator.h" #include "base/logging.h" #include "base/scoped_vector.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" +#include "ui/base/l10n/l10n_util.h" #include "unicode/uscript.h" namespace { diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc index e35aca3..668c4df 100644 --- a/chrome/browser/history/top_sites.cc +++ b/chrome/browser/history/top_sites.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <set> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/logging.h" #include "base/md5.h" @@ -34,6 +33,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" namespace history { diff --git a/chrome/browser/history/top_sites_unittest.cc b/chrome/browser/history/top_sites_unittest.cc index 22998d7..30d445f 100644 --- a/chrome/browser/history/top_sites_unittest.cc +++ b/chrome/browser/history/top_sites_unittest.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/file_util.h" #include "base/format_macros.h" @@ -33,6 +32,7 @@ #include "grit/locale_settings.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" namespace history { diff --git a/chrome/browser/history/url_database.cc b/chrome/browser/history/url_database.cc index dd3346b..b6246fe 100644 --- a/chrome/browser/history/url_database.cc +++ b/chrome/browser/history/url_database.cc @@ -9,11 +9,11 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "app/sql/statement.h" #include "base/utf_string_conversions.h" #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" +#include "ui/base/l10n/l10n_util.h" namespace history { diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index 484414f..1d1a95b 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -15,7 +15,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "app/win/scoped_co_mem.h" #include "app/win/scoped_com_initializer.h" #include "base/file_path.h" @@ -40,6 +39,7 @@ #include "chrome/common/url_constants.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/password_form.h" using base::Time; diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index 0ca99f5..e1483ba 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -4,7 +4,6 @@ #include "chrome/browser/importer/importer.h" -#include "app/l10n_util.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -26,6 +25,7 @@ #include "gfx/favicon_size.h" #include "grit/generated_resources.h" #include "skia/ext/image_operations.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/image_decoder.h" // TODO(port): Port these files. diff --git a/chrome/browser/importer/importer_bridge.cc b/chrome/browser/importer/importer_bridge.cc index b714218..2fb48a7 100644 --- a/chrome/browser/importer/importer_bridge.cc +++ b/chrome/browser/importer/importer_bridge.cc @@ -4,7 +4,6 @@ #include "chrome/browser/importer/importer_bridge.h" -#include "app/l10n_util.h" #include "base/scoped_ptr.h" #include "base/string_number_conversions.h" #include "base/string16.h" @@ -19,6 +18,7 @@ #include "chrome/common/child_thread.h" #include "chrome/browser/importer/importer_messages.h" #include "chrome/profile_import/profile_import_thread.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/password_form.h" ImporterBridge::ImporterBridge() { } diff --git a/chrome/browser/importer/importer_list.cc b/chrome/browser/importer/importer_list.cc index 9574f95..a6c85d1 100644 --- a/chrome/browser/importer/importer_list.cc +++ b/chrome/browser/importer/importer_list.cc @@ -4,7 +4,6 @@ #include "chrome/browser/importer/importer_list.h" -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/stl_util-inl.h" #include "base/values.h" @@ -17,6 +16,7 @@ #include "chrome/browser/importer/toolbar_importer.h" #include "chrome/browser/shell_integration.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #if defined(OS_WIN) #include "chrome/browser/importer/ie_importer.h" diff --git a/chrome/browser/instant/instant_confirm_dialog.cc b/chrome/browser/instant/instant_confirm_dialog.cc index e56a822..5ef3d87d 100644 --- a/chrome/browser/instant/instant_confirm_dialog.cc +++ b/chrome/browser/instant/instant_confirm_dialog.cc @@ -4,7 +4,6 @@ #include "chrome/browser/instant/instant_confirm_dialog.h" -#include "app/l10n_util.h" #include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/instant/promo_counter.h" #include "chrome/browser/prefs/pref_service.h" @@ -12,6 +11,7 @@ #include "chrome/common/pref_names.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace browser { diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index e2223af..b674921 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -9,7 +9,6 @@ #include <utility> #include <vector> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/string_number_conversions.h" #include "base/timer.h" @@ -42,6 +41,7 @@ #include "gfx/codec/png_codec.h" #include "ipc/ipc_message.h" #include "net/http/http_util.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/jumplist_win.cc b/chrome/browser/jumplist_win.cc index b953795..5b27d01 100644 --- a/chrome/browser/jumplist_win.cc +++ b/chrome/browser/jumplist_win.cc @@ -12,7 +12,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/command_line.h" #include "base/file_util.h" @@ -36,10 +35,11 @@ #include "gfx/codec/png_codec.h" #include "gfx/icon_util.h" #include "googleurl/src/gurl.h" -#include "third_party/skia/include/core/SkBitmap.h" - #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" + namespace { diff --git a/chrome/browser/language_combobox_model.cc b/chrome/browser/language_combobox_model.cc index 6366d59..54e67e1 100644 --- a/chrome/browser/language_combobox_model.cc +++ b/chrome/browser/language_combobox_model.cc @@ -4,7 +4,6 @@ #include "chrome/browser/language_combobox_model.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/string_split.h" #include "base/stringprintf.h" @@ -14,6 +13,7 @@ #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "unicode/uloc.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/language_order_table_model.cc b/chrome/browser/language_order_table_model.cc index b1d0450..7f4c42a 100644 --- a/chrome/browser/language_order_table_model.cc +++ b/chrome/browser/language_order_table_model.cc @@ -6,10 +6,10 @@ #include <set> -#include "app/l10n_util.h" #include "base/string_split.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" LanguageOrderTableModel::LanguageOrderTableModel() diff --git a/chrome/browser/memory_details.cc b/chrome/browser/memory_details.cc index 233f444..0852ef3 100644 --- a/chrome/browser/memory_details.cc +++ b/chrome/browser/memory_details.cc @@ -4,7 +4,6 @@ #include "chrome/browser/memory_details.h" -#include "app/l10n_util.h" #include "base/file_version_info.h" #include "base/metrics/histogram.h" #include "base/process_util.h" @@ -24,6 +23,7 @@ #include "chrome/common/url_constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #if defined(OS_LINUX) #include "chrome/browser/zygote_host_linux.h" diff --git a/chrome/browser/memory_details_mac.cc b/chrome/browser/memory_details_mac.cc index fbc4d98..d4d14fd 100644 --- a/chrome/browser/memory_details_mac.cc +++ b/chrome/browser/memory_details_mac.cc @@ -7,7 +7,6 @@ #include <set> #include <string> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/file_path.h" #include "base/file_version_info.h" @@ -26,6 +25,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" #include "grit/chromium_strings.h" +#include "ui/base/l10n/l10n_util.h" // TODO(viettrungluu): Many of the TODOs below are subsumed by a general need to // refactor the about:memory code (not just on Mac, but probably on other diff --git a/chrome/browser/memory_details_win.cc b/chrome/browser/memory_details_win.cc index 4684fd0..697f608 100644 --- a/chrome/browser/memory_details_win.cc +++ b/chrome/browser/memory_details_win.cc @@ -6,7 +6,6 @@ #include <psapi.h> -#include "app/l10n_util.h" #include "base/file_path.h" #include "base/file_version_info.h" #include "base/string_util.h" @@ -20,6 +19,7 @@ #include "chrome/common/chrome_version_info.h" #include "chrome/common/url_constants.h" #include "grit/chromium_strings.h" +#include "ui/base/l10n/l10n_util.h" // Known browsers which we collect details for. enum { diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc index 0bdb0a8..64e4efd 100644 --- a/chrome/browser/notifications/desktop_notification_service.cc +++ b/chrome/browser/notifications/desktop_notification_service.cc @@ -4,7 +4,6 @@ #include "chrome/browser/notifications/desktop_notification_service.h" -#include "app/l10n_util.h" #include "base/metrics/histogram.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" @@ -36,6 +35,7 @@ #include "grit/theme_resources.h" #include "net/base/escape.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebNotificationPresenter.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" using WebKit::WebNotificationPresenter; diff --git a/chrome/browser/notifications/notification_exceptions_table_model.cc b/chrome/browser/notifications/notification_exceptions_table_model.cc index 55a82bb..7a70875 100644 --- a/chrome/browser/notifications/notification_exceptions_table_model.cc +++ b/chrome/browser/notifications/notification_exceptions_table_model.cc @@ -4,7 +4,6 @@ #include "chrome/browser/notifications/notification_exceptions_table_model.h" -#include "app/l10n_util.h" #include "base/auto_reset.h" #include "chrome/common/content_settings.h" #include "chrome/common/content_settings_helper.h" @@ -13,6 +12,7 @@ #include "chrome/common/notification_type.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" struct NotificationExceptionsTableModel::Entry { diff --git a/chrome/browser/notifications/notification_exceptions_table_model_unittest.cc b/chrome/browser/notifications/notification_exceptions_table_model_unittest.cc index 4fdcb24..693f1ec 100644 --- a/chrome/browser/notifications/notification_exceptions_table_model_unittest.cc +++ b/chrome/browser/notifications/notification_exceptions_table_model_unittest.cc @@ -4,13 +4,13 @@ #include "chrome/browser/notifications/notification_exceptions_table_model.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/renderer_host/test/test_render_view_host.h" #include "chrome/test/testing_profile.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/l10n/l10n_util.h" class NotificationExceptionsTableModelTest : public RenderViewHostTestHarness { public: diff --git a/chrome/browser/notifications/notification_options_menu_model.cc b/chrome/browser/notifications/notification_options_menu_model.cc index 4d4530e..c524643 100644 --- a/chrome/browser/notifications/notification_options_menu_model.cc +++ b/chrome/browser/notifications/notification_options_menu_model.cc @@ -4,7 +4,6 @@ #include "chrome/browser/notifications/notification_options_menu_model.h" -#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "base/logging.h" #include "base/utf_string_conversions.h" @@ -22,6 +21,7 @@ #include "chrome/common/extensions/extension.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #if defined(OS_WIN) #include "chrome/browser/ui/views/browser_dialogs.h" diff --git a/chrome/browser/omnibox_search_hint.cc b/chrome/browser/omnibox_search_hint.cc index 2000155..dcd5224 100644 --- a/chrome/browser/omnibox_search_hint.cc +++ b/chrome/browser/omnibox_search_hint.cc @@ -4,7 +4,6 @@ #include "chrome/browser/omnibox_search_hint.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/metrics/histogram.h" #include "base/task.h" @@ -30,6 +29,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 URLs of search engines for which we want to trigger the infobar. diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc index 2bdbbfe..65cfca6 100644 --- a/chrome/browser/page_info_model.cc +++ b/chrome/browser/page_info_model.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/i18n/time_formatting.h" #include "base/string_number_conversions.h" @@ -20,6 +19,7 @@ #include "net/base/ssl_connection_status_flags.h" #include "net/base/ssl_cipher_suite_names.h" #include "net/base/x509_certificate.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #if defined(OS_MACOSX) diff --git a/chrome/browser/password_manager/encryptor_password_mac.mm b/chrome/browser/password_manager/encryptor_password_mac.mm index a92fdcd..5488f4c 100644 --- a/chrome/browser/password_manager/encryptor_password_mac.mm +++ b/chrome/browser/password_manager/encryptor_password_mac.mm @@ -6,10 +6,10 @@ #import <Security/Security.h> -#include "app/l10n_util.h" #include "chrome/browser/keychain_mac.h" #include "chrome/browser/sync/util/crypto_helpers.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/password_manager_delegate_impl.cc b/chrome/browser/password_manager_delegate_impl.cc index 39de4c5..70c263cf 100644 --- a/chrome/browser/password_manager_delegate_impl.cc +++ b/chrome/browser/password_manager_delegate_impl.cc @@ -4,7 +4,6 @@ #include "chrome/browser/password_manager_delegate_impl.h" -#include "app/l10n_util.h" #include "base/metrics/histogram.h" #include "base/singleton.h" #include "chrome/browser/password_manager/password_form_manager.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 "webkit/glue/password_form.h" diff --git a/chrome/browser/platform_util_chromeos.cc b/chrome/browser/platform_util_chromeos.cc index f059385..cbca7c8 100644 --- a/chrome/browser/platform_util_chromeos.cc +++ b/chrome/browser/platform_util_chromeos.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/process_util.h" #include "base/task.h" @@ -19,6 +18,7 @@ #include "chrome/common/process_watcher.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" class Profile; diff --git a/chrome/browser/platform_util_mac.mm b/chrome/browser/platform_util_mac.mm index 5306598..abc72ab 100644 --- a/chrome/browser/platform_util_mac.mm +++ b/chrome/browser/platform_util_mac.mm @@ -8,14 +8,14 @@ #import <Cocoa/Cocoa.h> #import <CoreServices/CoreServices.h> -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" #include "base/file_path.h" #include "base/logging.h" #include "base/mac/scoped_aedesc.h" #include "base/sys_string_conversions.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace platform_util { diff --git a/chrome/browser/plugin_exceptions_table_model.cc b/chrome/browser/plugin_exceptions_table_model.cc index f42289a..99169ac 100644 --- a/chrome/browser/plugin_exceptions_table_model.cc +++ b/chrome/browser/plugin_exceptions_table_model.cc @@ -4,12 +4,12 @@ #include "chrome/browser/plugin_exceptions_table_model.h" -#include "app/l10n_util.h" #include "base/auto_reset.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" PluginExceptionsTableModel::PluginExceptionsTableModel( diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc new file mode 100644 index 0000000..c1b1d03 --- /dev/null +++ b/chrome/browser/plugin_installer.cc @@ -0,0 +1,83 @@ +// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +#include "chrome/browser/plugin_installer.h" + +#include "base/string_util.h" +#include "chrome/browser/renderer_host/render_view_host.h" +#include "chrome/browser/tab_contents/tab_contents.h" +#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/plugins/npapi/default_plugin_shared.h" + +// The URL for the "Problems installing" page for the Plugins infobar. +static const char kLearnMorePluginInstallerUrl[] = + "http://www.google.com/support/chrome/bin/answer.py?answer=95697&topic=14687"; + +PluginInstaller::PluginInstaller(TabContents* tab_contents) + : ConfirmInfoBarDelegate(tab_contents), + tab_contents_(tab_contents) { +} + +PluginInstaller::~PluginInstaller() { + // Remove any InfoBars we may be showing. + tab_contents_->RemoveInfoBar(this); +} + +void PluginInstaller::OnMissingPluginStatus(int status) { + switch (status) { + case webkit::npapi::default_plugin::MISSING_PLUGIN_AVAILABLE: { + tab_contents_->AddInfoBar(this); + break; + } + case webkit::npapi::default_plugin::MISSING_PLUGIN_USER_STARTED_DOWNLOAD: { + // Hide the InfoBar if user already started download/install of the + // missing plugin. + tab_contents_->RemoveInfoBar(this); + break; + } + default: { + NOTREACHED(); + break; + } + } +} + +string16 PluginInstaller::GetMessageText() const { + return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_MISSINGPLUGIN_PROMPT); +} + +SkBitmap* PluginInstaller::GetIcon() const { + return ResourceBundle::GetSharedInstance().GetBitmapNamed( + IDR_INFOBAR_PLUGIN_INSTALL); +} + +int PluginInstaller::GetButtons() const { + return BUTTON_OK; +} + +string16 PluginInstaller::GetButtonLabel(InfoBarButton button) const { + if (button == BUTTON_OK) + return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_INSTALLPLUGIN_BUTTON); + return ConfirmInfoBarDelegate::GetButtonLabel(button); +} + +bool PluginInstaller::Accept() { + tab_contents_->render_view_host()->InstallMissingPlugin(); + return true; +} + +string16 PluginInstaller::GetLinkText() { + return l10n_util::GetStringUTF16(IDS_PLUGININSTALLER_PROBLEMSINSTALLING); +} + +bool PluginInstaller::LinkClicked(WindowOpenDisposition disposition) { + // Ignore the click dispostion and always open in a new top level tab. + tab_contents_->OpenURL(GURL(kLearnMorePluginInstallerUrl), GURL(), + NEW_FOREGROUND_TAB, PageTransition::LINK); + return false; // Do not dismiss the info bar. +} diff --git a/chrome/browser/plugin_installer_infobar_delegate.cc b/chrome/browser/plugin_installer_infobar_delegate.cc index e634a55..8a035ed 100644 --- a/chrome/browser/plugin_installer_infobar_delegate.cc +++ b/chrome/browser/plugin_installer_infobar_delegate.cc @@ -4,12 +4,12 @@ #include "chrome/browser/plugin_installer_infobar_delegate.h" -#include "app/l10n_util.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/browser/tab_contents/tab_contents.h" #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/plugins/npapi/default_plugin_shared.h" diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc index 809a8ac..68edbb5 100644 --- a/chrome/browser/prefs/pref_service.cc +++ b/chrome/browser/prefs/pref_service.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <string> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" @@ -30,6 +29,7 @@ #include "chrome/common/notification_service.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { 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 cafad5a..73f5559 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc @@ -7,7 +7,6 @@ #include <stack> #include <vector> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" @@ -22,6 +21,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/service_messages.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" // TODO(sanjeevr): Localize the product name? const char kCloudPrintProductName[] = "Google Cloud Print"; diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h index 86077ab..02be7f1 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_flow.h @@ -8,13 +8,13 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/time.h" #include "chrome/browser/dom_ui/html_dialog_ui.h" #include "chrome/common/net/gaia/gaia_auth_consumer.h" #include "chrome/common/net/gaia/gaia_auth_fetcher.h" #include "gfx/native_widget_types.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" class GaiaAuthFetcher; class CloudPrintServiceProcessHelper; diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc index 01ff8b1..1159dbb 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -18,6 +17,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" // Define the values of standard URLs. diff --git a/chrome/browser/printing/cloud_print/cloud_print_setup_source_unittest.cc b/chrome/browser/printing/cloud_print/cloud_print_setup_source_unittest.cc index 10dcd8ab..e20a7e9 100644 --- a/chrome/browser/printing/cloud_print/cloud_print_setup_source_unittest.cc +++ b/chrome/browser/printing/cloud_print/cloud_print_setup_source_unittest.cc @@ -1,8 +1,7 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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 "grit/app_resources.h"
#include "grit/browser_resources.h"
#include "grit/chromium_strings.h"
@@ -10,6 +9,7 @@ #include "grit/locale_settings.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/gmock/include/gmock/gmock.h"
+#include "ui/base/l10n/l10n_util.h"
using testing::HasSubstr;
using testing::Not;
diff --git a/chrome/browser/printing/print_dialog_cloud.cc b/chrome/browser/printing/print_dialog_cloud.cc index 717fadc..9b6559b 100644 --- a/chrome/browser/printing/print_dialog_cloud.cc +++ b/chrome/browser/printing/print_dialog_cloud.cc @@ -5,7 +5,6 @@ #include "chrome/browser/printing/print_dialog_cloud.h" #include "chrome/browser/printing/print_dialog_cloud_internal.h" -#include "app/l10n_util.h" #include "base/base64.h" #include "base/file_util.h" #include "base/json/json_reader.h" @@ -28,6 +27,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/render_messages_params.h" #include "chrome/common/url_constants.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/webpreferences.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc index 6381f61..84efcf4 100644 --- a/chrome/browser/printing/print_view_manager.cc +++ b/chrome/browser/printing/print_view_manager.cc @@ -4,7 +4,6 @@ #include "chrome/browser/printing/print_view_manager.h" -#include "app/l10n_util.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_process.h" @@ -20,6 +19,7 @@ #include "grit/generated_resources.h" #include "printing/native_metafile.h" #include "printing/printed_document.h" +#include "ui/base/l10n/l10n_util.h" using base::TimeDelta; diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index bd987fb..0266f73 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -55,7 +55,6 @@ #include <set> #include <string> -#include "app/l10n_util.h" #include "base/base_paths.h" #include "base/basictypes.h" #include "base/command_line.h" @@ -91,6 +90,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" const int ProcessSingleton::kTimeoutInSeconds; diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index 87c9966..1be5a87 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc @@ -4,7 +4,6 @@ #include "chrome/browser/process_singleton.h" -#include "app/l10n_util.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/file_path.h" @@ -24,6 +23,7 @@ #include "chrome/common/result_codes.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/win/hwnd_util.h" namespace { diff --git a/chrome/browser/profile_import_process_host.cc b/chrome/browser/profile_import_process_host.cc index 3663ef7..b2bfb26 100644 --- a/chrome/browser/profile_import_process_host.cc +++ b/chrome/browser/profile_import_process_host.cc @@ -4,7 +4,6 @@ #include "chrome/browser/profile_import_process_host.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/message_loop.h" #include "base/string_number_conversions.h" @@ -14,6 +13,7 @@ #include "chrome/common/chrome_switches.h" #include "grit/generated_resources.h" #include "ipc/ipc_switches.h" +#include "ui/base/l10n/l10n_util.h" ProfileImportProcessHost::ProfileImportProcessHost( ResourceDispatcherHost* resource_dispatcher, diff --git a/chrome/browser/remoting/remoting_options_handler.cc b/chrome/browser/remoting/remoting_options_handler.cc index 8e1d549..e4658ab 100644 --- a/chrome/browser/remoting/remoting_options_handler.cc +++ b/chrome/browser/remoting/remoting_options_handler.cc @@ -4,13 +4,13 @@ #include "chrome/browser/remoting/remoting_options_handler.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/remoting/chromoting_host_info.h" #include "chrome/browser/dom_ui/dom_ui.h" #include "chrome/browser/service/service_process_control_manager.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace remoting { diff --git a/chrome/browser/remoting/remoting_resources_source.cc b/chrome/browser/remoting/remoting_resources_source.cc index fab4639..fdf5ba1 100644 --- a/chrome/browser/remoting/remoting_resources_source.cc +++ b/chrome/browser/remoting/remoting_resources_source.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <string> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "base/values.h" @@ -19,6 +18,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" // Define the values of standard URLs. diff --git a/chrome/browser/remoting/setup_flow.cc b/chrome/browser/remoting/setup_flow.cc index 689049a..1c29036 100644 --- a/chrome/browser/remoting/setup_flow.cc +++ b/chrome/browser/remoting/setup_flow.cc @@ -4,7 +4,6 @@ #include "chrome/browser/remoting/setup_flow.h" -#include "app/l10n_util.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/utf_string_conversions.h" @@ -23,6 +22,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/l10n/l10n_font_util.h" +#include "ui/base/l10n/l10n_util.h" namespace remoting { diff --git a/chrome/browser/remoting/setup_flow_get_status_step.cc b/chrome/browser/remoting/setup_flow_get_status_step.cc index 57c7b60..d77e1a1 100644 --- a/chrome/browser/remoting/setup_flow_get_status_step.cc +++ b/chrome/browser/remoting/setup_flow_get_status_step.cc @@ -4,11 +4,11 @@ #include "chrome/browser/remoting/setup_flow_get_status_step.h" -#include "app/l10n_util.h" #include "chrome/browser/remoting/setup_flow_register_step.h" #include "chrome/browser/service/service_process_control.h" #include "chrome/browser/service/service_process_control_manager.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace remoting { diff --git a/chrome/browser/remoting/setup_flow_register_step.cc b/chrome/browser/remoting/setup_flow_register_step.cc index 1e85388..d99eb7e 100644 --- a/chrome/browser/remoting/setup_flow_register_step.cc +++ b/chrome/browser/remoting/setup_flow_register_step.cc @@ -4,11 +4,11 @@ #include "chrome/browser/remoting/setup_flow_register_step.h" -#include "app/l10n_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/remoting/setup_flow_login_step.h" #include "chrome/browser/remoting/setup_flow_start_host_step.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace remoting { diff --git a/chrome/browser/remoting/setup_flow_start_host_step.cc b/chrome/browser/remoting/setup_flow_start_host_step.cc index 0a11bb2..3e555a2 100644 --- a/chrome/browser/remoting/setup_flow_start_host_step.cc +++ b/chrome/browser/remoting/setup_flow_start_host_step.cc @@ -4,11 +4,11 @@ #include "chrome/browser/remoting/setup_flow_start_host_step.h" -#include "app/l10n_util.h" #include "chrome/browser/remoting/setup_flow_get_status_step.h" #include "chrome/browser/service/service_process_control.h" #include "chrome/browser/service/service_process_control_manager.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace remoting { diff --git a/chrome/browser/renderer_host/gtk_im_context_wrapper.cc b/chrome/browser/renderer_host/gtk_im_context_wrapper.cc index 87d12bf..40fe2d4 100644 --- a/chrome/browser/renderer_host/gtk_im_context_wrapper.cc +++ b/chrome/browser/renderer_host/gtk_im_context_wrapper.cc @@ -10,7 +10,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" #include "base/third_party/icu/icu_utf.h" @@ -28,6 +27,7 @@ #include "gfx/rect.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkColor.h" +#include "ui/base/l10n/l10n_util.h" namespace { // Copied from third_party/WebKit/Source/WebCore/page/EventHandler.cpp diff --git a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc index 3639c1f..2a18195 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_gtk.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_gtk.cc @@ -18,7 +18,6 @@ #include <algorithm> #include <string> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/logging.h" #include "base/message_loop.h" @@ -37,6 +36,7 @@ #include "chrome/common/native_web_keyboard_event.h" #include "gfx/gtk_preserve_window.h" #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/x/x11_util.h" #include "webkit/glue/webaccessibility.h" #include "webkit/glue/webcursor_gtk_data.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc index 9d6bcc9..9e4a2c9 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_views.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <string> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/logging.h" #include "base/message_loop.h" @@ -24,6 +23,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFactory.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/x/x11_util.h" #include "views/event.h" #include "views/widget/widget.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index 021c19b..1bf8421 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -6,8 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" -#include "app/l10n_util_win.h" #include "base/command_line.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" @@ -39,6 +37,8 @@ #include "skia/ext/skia_utils_win.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" #include "third_party/WebKit/Source/WebKit/chromium/public/win/WebInputEventFactory.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_win.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/view_prop.h" #include "ui/base/win/hwnd_util.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index 4b059c3..6f2f945 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -8,7 +8,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/lazy_instance.h" #include "base/string_number_conversions.h" @@ -35,6 +34,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/escape.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" // For malware interstitial pages, we link the problematic URL to Google's diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc index b9cbac8..aa6c3a9 100644 --- a/chrome/browser/search_engines/template_url.cc +++ b/chrome/browser/search_engines/template_url.cc @@ -4,7 +4,6 @@ #include "chrome/browser/search_engines/template_url.h" -#include "app/l10n_util.h" #include "base/i18n/icu_string_conversions.h" #include "base/i18n/rtl.h" #include "base/logging.h" @@ -16,6 +15,7 @@ #include "chrome/common/url_constants.h" #include "gfx/favicon_size.h" #include "net/base/escape.h" +#include "ui/base/l10n/l10n_util.h" // The TemplateURLRef has any number of terms that need to be replaced. Each of // the terms is enclosed in braces. If the character preceeding the final diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc index 5894932..a1cfdac 100644 --- a/chrome/browser/search_engines/template_url_model.cc +++ b/chrome/browser/search_engines/template_url_model.cc @@ -4,7 +4,6 @@ #include "chrome/browser/search_engines/template_url_model.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/environment.h" #include "base/stl_util-inl.h" @@ -33,6 +32,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" using base::Time; typedef SearchHostToURLsMap::TemplateURLSet TemplateURLSet; diff --git a/chrome/browser/search_engines/template_url_table_model.cc b/chrome/browser/search_engines/template_url_table_model.cc index ddcd561..ed659a9 100644 --- a/chrome/browser/search_engines/template_url_table_model.cc +++ b/chrome/browser/search_engines/template_url_table_model.cc @@ -4,7 +4,6 @@ #include "chrome/browser/search_engines/template_url_table_model.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/i18n/rtl.h" #include "base/stl_util-inl.h" @@ -17,6 +16,7 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model_observer.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/speech/speech_input_bubble_gtk.cc b/chrome/browser/speech/speech_input_bubble_gtk.cc index 43b6c07..95c183f 100644 --- a/chrome/browser/speech/speech_input_bubble_gtk.cc +++ b/chrome/browser/speech/speech_input_bubble_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/speech/speech_input_bubble.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/gtk/gtk_theme_provider.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" namespace { diff --git a/chrome/browser/speech/speech_input_bubble_views.cc b/chrome/browser/speech/speech_input_bubble_views.cc index 404dfb6..c6083b4 100644 --- a/chrome/browser/speech/speech_input_bubble_views.cc +++ b/chrome/browser/speech/speech_input_bubble_views.cc @@ -4,7 +4,6 @@ #include "chrome/browser/speech/speech_input_bubble.h" -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_window.h" @@ -14,6 +13,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/controls/button/native_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/speech/speech_input_manager.cc b/chrome/browser/speech/speech_input_manager.cc index 6634b42..984d5b9 100644 --- a/chrome/browser/speech/speech_input_manager.cc +++ b/chrome/browser/speech/speech_input_manager.cc @@ -7,7 +7,6 @@ #include <map> #include <string> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/lazy_instance.h" #include "base/ref_counted.h" @@ -25,6 +24,7 @@ #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "media/audio/audio_manager.h" +#include "ui/base/l10n/l10n_util.h" #if defined(OS_WIN) #include "chrome/installer/util/wmi.h" diff --git a/chrome/browser/speech/speech_recognition_request.cc b/chrome/browser/speech/speech_recognition_request.cc index 754534a..74665e98 100644 --- a/chrome/browser/speech/speech_recognition_request.cc +++ b/chrome/browser/speech/speech_recognition_request.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/l10n_util.h" #include "base/json/json_reader.h" #include "base/string_util.h" #include "base/values.h" @@ -15,6 +14,7 @@ #include "net/base/load_flags.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_status.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/spellcheck_host.cc b/chrome/browser/spellcheck_host.cc index 7a5ffa6..4c59b56 100644 --- a/chrome/browser/spellcheck_host.cc +++ b/chrome/browser/spellcheck_host.cc @@ -6,7 +6,6 @@ #include <fcntl.h> -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" @@ -25,6 +24,7 @@ #include "chrome/common/spellcheck_common.h" #include "googleurl/src/gurl.h" #include "third_party/hunspell/google/bdict.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ssl/ssl_add_cert_handler_mac.mm b/chrome/browser/ssl/ssl_add_cert_handler_mac.mm index 68b9418..48b9859 100644 --- a/chrome/browser/ssl/ssl_add_cert_handler_mac.mm +++ b/chrome/browser/ssl/ssl_add_cert_handler_mac.mm @@ -7,7 +7,6 @@ #include <SecurityInterface/SFCertificatePanel.h> #include <SecurityInterface/SFCertificateView.h> -#include "app/l10n_util_mac.h" #include "base/logging.h" #include "base/scoped_nsobject.h" #include "chrome/common/logging_chrome.h" @@ -16,6 +15,7 @@ #include "chrome/browser/ui/browser_window.h" #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" +#include "ui/base/l10n/l10n_util_mac.h" @interface SSLAddCertHandlerCocoa : NSObject { diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index 59a6447..8d3b315 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ssl/ssl_blocking_page.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/metrics/histogram.h" #include "base/string_piece.h" @@ -23,6 +22,7 @@ #include "chrome/common/notification_service.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/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc index 6769d88..ee3df60 100644 --- a/chrome/browser/ssl/ssl_error_info.cc +++ b/chrome/browser/ssl/ssl_error_info.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ssl/ssl_error_info.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/cert_store.h" #include "chrome/common/time_format.h" @@ -14,6 +13,7 @@ #include "net/base/cert_status_flags.h" #include "net/base/net_errors.h" #include "net/base/ssl_info.h" +#include "ui/base/l10n/l10n_util.h" SSLErrorInfo::SSLErrorInfo(const string16& title, const string16& details, diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc index f40767d..7d662c0c 100644 --- a/chrome/browser/ssl/ssl_manager.cc +++ b/chrome/browser/ssl/ssl_manager.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ssl/ssl_manager.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/load_from_memory_cache_details.h" @@ -22,6 +21,7 @@ #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "net/base/cert_status_flags.h" +#include "ui/base/l10n/l10n_util.h" // static void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh, diff --git a/chrome/browser/sync/profile_sync_service.cc b/chrome/browser/sync/profile_sync_service.cc index d031292..f1e99bf 100644 --- a/chrome/browser/sync/profile_sync_service.cc +++ b/chrome/browser/sync/profile_sync_service.cc @@ -7,7 +7,6 @@ #include <map> #include <set> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/command_line.h" @@ -45,6 +44,7 @@ #include "grit/generated_resources.h" #include "jingle/notifier/communicator/const_communicator.h" #include "net/base/cookie_monster.h" +#include "ui/base/l10n/l10n_util.h" using browser_sync::ChangeProcessor; using browser_sync::DataTypeController; diff --git a/chrome/browser/sync/sync_setup_flow.h b/chrome/browser/sync/sync_setup_flow.h index b47c103..8861fd7 100644 --- a/chrome/browser/sync/sync_setup_flow.h +++ b/chrome/browser/sync/sync_setup_flow.h @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/gtest_prod_util.h" #include "base/time.h" #include "chrome/browser/dom_ui/html_dialog_ui.h" @@ -18,6 +17,7 @@ #include "chrome/browser/sync/syncable/model_type.h" #include "gfx/native_widget_types.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" class FlowHandler; class SyncSetupFlowContainer; diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index fd71497..e1ac70f 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -4,7 +4,6 @@ #include "chrome/browser/sync/sync_ui_util.h" -#include "app/l10n_util.h" #include "base/i18n/number_formatting.h" #include "base/i18n/time_formatting.h" #include "base/string_util.h" @@ -16,6 +15,7 @@ #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" typedef GoogleServiceAuthError AuthError; diff --git a/chrome/browser/sync/sync_ui_util_mac.mm b/chrome/browser/sync/sync_ui_util_mac.mm index 3cd17d5..51a6bb7 100644 --- a/chrome/browser/sync/sync_ui_util_mac.mm +++ b/chrome/browser/sync/sync_ui_util_mac.mm @@ -6,11 +6,11 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util_mac.h" #include "base/logging.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/sync_ui_util.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace sync_ui_util { diff --git a/chrome/browser/sync/sync_ui_util_mac_unittest.mm b/chrome/browser/sync/sync_ui_util_mac_unittest.mm index ef5e32f..bebb06e 100644 --- a/chrome/browser/sync/sync_ui_util_mac_unittest.mm +++ b/chrome/browser/sync/sync_ui_util_mac_unittest.mm @@ -6,12 +6,12 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util_mac.h" #include "base/scoped_nsobject.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/chrome/browser/tab_contents/infobar_delegate.cc b/chrome/browser/tab_contents/infobar_delegate.cc index 5ef969a..0834b73 100644 --- a/chrome/browser/tab_contents/infobar_delegate.cc +++ b/chrome/browser/tab_contents/infobar_delegate.cc @@ -4,13 +4,13 @@ #include "chrome/browser/tab_contents/infobar_delegate.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "build/build_config.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" // InfoBarDelegate ------------------------------------------------------------ diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index a8b4a94..1095f58 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -7,7 +7,6 @@ #include "chrome/browser/tab_contents/render_view_context_menu.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/logging.h" #include "base/metrics/histogram.h" @@ -52,10 +51,11 @@ #include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/url_request/url_request.h" -#include "webkit/glue/webmenuitem.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebContextMenuData.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerAction.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextDirection.h" +#include "ui/base/l10n/l10n_util.h" +#include "webkit/glue/webmenuitem.h" using WebKit::WebContextMenuData; using WebKit::WebMediaPlayerAction; diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index fff691f..758a1d0 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -6,7 +6,6 @@ #include <cmath> -#include "app/l10n_util.h" #include "base/auto_reset.h" #include "base/metrics/histogram.h" #include "base/metrics/stats_counters.h" @@ -103,6 +102,7 @@ #include "net/base/net_util.h" #include "net/base/registry_controlled_domain.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/glue/password_form.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc index 06048ac..aaf7c4f 100644 --- a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc +++ b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc @@ -4,7 +4,6 @@ #include "chrome/browser/tab_contents/tab_contents_ssl_helper.h" -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" @@ -19,6 +18,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/net_errors.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/task_manager/task_manager.cc b/chrome/browser/task_manager/task_manager.cc index d0f6df1..879ecd5a 100644 --- a/chrome/browser/task_manager/task_manager.cc +++ b/chrome/browser/task_manager/task_manager.cc @@ -4,7 +4,6 @@ #include "chrome/browser/task_manager/task_manager.h" -#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "base/i18n/number_formatting.h" #include "base/i18n/rtl.h" @@ -32,6 +31,7 @@ #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "unicode/coll.h" diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index 79b6dc1..b385525 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -4,7 +4,6 @@ #include "chrome/browser/task_manager/task_manager.h" -#include "app/l10n_util.h" #include "base/file_path.h" #include "base/utf_string_conversions.h" #include "chrome/browser/background_contents_service.h" @@ -29,6 +28,7 @@ #include "chrome/test/ui_test_utils.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/task_manager/task_manager_resource_providers.cc b/chrome/browser/task_manager/task_manager_resource_providers.cc index e436347..0a82236 100644 --- a/chrome/browser/task_manager/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager/task_manager_resource_providers.cc @@ -6,7 +6,6 @@ #include "build/build_config.h" -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/file_version_info.h" #include "base/i18n/rtl.h" @@ -40,6 +39,7 @@ #include "chrome/common/sqlite_utils.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_MACOSX) diff --git a/chrome/browser/task_manager/task_manager_unittest.cc b/chrome/browser/task_manager/task_manager_unittest.cc index 03b5705..a4e93f5 100644 --- a/chrome/browser/task_manager/task_manager_unittest.cc +++ b/chrome/browser/task_manager/task_manager_unittest.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/process_util.h" #include "base/utf_string_conversions.h" @@ -14,6 +13,7 @@ #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/translate/options_menu_model.cc b/chrome/browser/translate/options_menu_model.cc index d56f001..04278e7 100644 --- a/chrome/browser/translate/options_menu_model.cc +++ b/chrome/browser/translate/options_menu_model.cc @@ -4,7 +4,6 @@ #include "chrome/browser/translate/options_menu_model.h" -#include "app/l10n_util.h" #include "base/metrics/histogram.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/google/google_util.h" @@ -13,6 +12,7 @@ #include "chrome/browser/translate/translate_infobar_delegate.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/translate/translate_infobar_delegate.cc b/chrome/browser/translate/translate_infobar_delegate.cc index 5a9bbc4..c803b19 100644 --- a/chrome/browser/translate/translate_infobar_delegate.cc +++ b/chrome/browser/translate/translate_infobar_delegate.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/metrics/histogram.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" @@ -16,6 +15,7 @@ #include "chrome/common/chrome_constants.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" // static diff --git a/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc b/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc index 6adf2b2..8eaaa0b 100644 --- a/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc +++ b/chrome/browser/ui/app_modal_dialogs/message_box_handler.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "build/build_config.h" @@ -19,6 +18,7 @@ #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/chromium_strings.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" #include "ui/base/text/text_elider.h" diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc index 54f8677..75b6a55 100644 --- a/chrome/browser/ui/browser.cc +++ b/chrome/browser/ui/browser.cc @@ -12,7 +12,6 @@ #include <algorithm> #include <string> -#include "app/l10n_util.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/logging.h" @@ -109,6 +108,7 @@ #include "net/base/static_cookie_policy.h" #include "net/url_request/url_request_context.h" #include "ui/base/animation/animation.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/webkit_glue.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc index 88029d4..e96fea5 100644 --- a/chrome/browser/ui/browser_init.cc +++ b/chrome/browser/ui/browser_init.cc @@ -6,7 +6,6 @@ #include <algorithm> // For max(). -#include "app/l10n_util.h" #include "base/environment.h" #include "base/event_recorder.h" #include "base/file_path.h" @@ -65,6 +64,7 @@ #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "net/url_request/url_request.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/ui/cocoa/about_window_controller.mm b/chrome/browser/ui/cocoa/about_window_controller.mm index 2a2de02..45a4df7 100644 --- a/chrome/browser/ui/cocoa/about_window_controller.mm +++ b/chrome/browser/ui/cocoa/about_window_controller.mm @@ -4,8 +4,6 @@ #import "chrome/browser/ui/cocoa/about_window_controller.h" -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/string_number_conversions.h" @@ -24,6 +22,8 @@ #include "grit/theme_resources.h" #include "grit/locale_settings.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/applescript/error_applescript.mm b/chrome/browser/ui/cocoa/applescript/error_applescript.mm index e86ffd0..1c9d72b 100644 --- a/chrome/browser/ui/cocoa/applescript/error_applescript.mm +++ b/chrome/browser/ui/cocoa/applescript/error_applescript.mm @@ -4,9 +4,9 @@ #import "chrome/browser/ui/cocoa/applescript/error_applescript.h" -#import "app/l10n_util_mac.h" #include "base/logging.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" void AppleScript::SetError(AppleScript::ErrorCode errorCode) { using namespace l10n_util; diff --git a/chrome/browser/ui/cocoa/base_bubble_controller.mm b/chrome/browser/ui/cocoa/base_bubble_controller.mm index 768e9f1..618faf9 100644 --- a/chrome/browser/ui/cocoa/base_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/base_bubble_controller.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/base_bubble_controller.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/scoped_nsobject.h" @@ -15,6 +14,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" @interface BaseBubbleController (Private) - (void)updateOriginFromAnchor; diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm index 5e8b0f2..37896a5 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_all_tabs_controller.h" -#include "app/l10n_util_mac.h" #include "base/string16.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -14,6 +13,7 @@ #include "chrome/browser/ui/browser_list.h" #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" @implementation BookmarkAllTabsController diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm index 84e1ac8..95bd859 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" -#include "app/l10n_util_mac.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_editor.h" @@ -43,6 +42,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" // Bookmark bar state changing and animations diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm index 82258da..d0a6dd8 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h" -#include "app/l10n_util_mac.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" // TODO(viettrungluu): remove @@ -17,6 +16,7 @@ #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" // Simple class to watch for tab creation/destruction and close the bubble. diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm index 097f5e7..129117d 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h" -#include "app/l10n_util_mac.h" #include "app/mac/nsimage_cache.h" #include "base/logging.h" #include "base/sys_string_conversions.h" @@ -14,6 +13,7 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" #import "chrome/browser/ui/cocoa/image_utils.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" @interface BookmarkButtonCell(Private) diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm index 8cce1b4..329a027 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm @@ -6,8 +6,6 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h" -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" @@ -18,6 +16,8 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_tree_browser_cell.h" #import "chrome/browser/ui/cocoa/browser_window_controller.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" @interface BookmarkEditorBaseController () diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm index 6325346..1df1697 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util_mac.h" #include "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" @@ -16,6 +15,7 @@ #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" +#include "ui/base/l10n/l10n_util_mac.h" class BookmarkEditorBaseControllerTest : public CocoaTest { public: diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm index 88ed4bf..557150f 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm @@ -4,10 +4,10 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h" -#include "app/l10n_util.h" #include "base/string16.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" +#include "ui/base/l10n/l10n_util.h" @interface BookmarkEditorController (Private) diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm index 5543da9..f5ac98a 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.mm @@ -4,7 +4,6 @@ #import <AppKit/AppKit.h> -#include "app/l10n_util.h" #include "app/mac/nsimage_cache.h" #include "base/sys_string_conversions.h" #import "chrome/browser/app_controller_mac.h" @@ -17,6 +16,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" BookmarkMenuBridge::BookmarkMenuBridge(Profile* profile) diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm index 4db77eb..fa369a2 100644 --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.mm @@ -4,13 +4,13 @@ #import "chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller.h" -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" +#include "ui/base/l10n/l10n_util.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" @implementation BookmarkNameFolderController diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.mm b/chrome/browser/ui/cocoa/browser_window_cocoa.mm index 79cdeff..362e852 100644 --- a/chrome/browser/ui/cocoa/browser_window_cocoa.mm +++ b/chrome/browser/ui/cocoa/browser_window_cocoa.mm @@ -4,7 +4,6 @@ #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" -#include "app/l10n_util_mac.h" #include "base/command_line.h" #include "base/logging.h" #include "base/message_loop.h" @@ -48,6 +47,7 @@ #include "gfx/rect.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" BrowserWindowCocoa::BrowserWindowCocoa(Browser* browser, BrowserWindowController* controller, diff --git a/chrome/browser/ui/cocoa/browser_window_controller.mm b/chrome/browser/ui/cocoa/browser_window_controller.mm index d761f54..c421b56 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller.mm @@ -6,8 +6,6 @@ #include <Carbon/Carbon.h> -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" #include "app/mac/scoped_nsdisable_screen_updates.h" #include "app/mac/nsimage_cache.h" #include "base/mac/mac_util.h" @@ -61,6 +59,8 @@ #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" // ORGANIZATION: This is a big file. It is (in principle) organized as follows // (in order): diff --git a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm index 4351532..e0a9edd 100644 --- a/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/browser_window_controller_unittest.mm @@ -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_mac.h" #include "base/scoped_nsobject.h" #include "base/scoped_ptr.h" #include "chrome/app/chrome_command_ids.h" @@ -16,6 +15,7 @@ #include "chrome/common/pref_names.h" #include "chrome/test/testing_profile.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" @interface BrowserWindowController (JustForTesting) // Already defined in BWC. diff --git a/chrome/browser/ui/cocoa/bug_report_window_controller.mm b/chrome/browser/ui/cocoa/bug_report_window_controller.mm index 5ea378a..39176fa 100644 --- a/chrome/browser/ui/cocoa/bug_report_window_controller.mm +++ b/chrome/browser/ui/cocoa/bug_report_window_controller.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/bug_report_window_controller.h" -#include "app/l10n_util_mac.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/bug_report_util.h" @@ -13,6 +12,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util_mac.h" @implementation BugReportWindowController diff --git a/chrome/browser/ui/cocoa/clear_browsing_data_controller.mm b/chrome/browser/ui/cocoa/clear_browsing_data_controller.mm index 0ced443..968e26f9 100644 --- a/chrome/browser/ui/cocoa/clear_browsing_data_controller.mm +++ b/chrome/browser/ui/cocoa/clear_browsing_data_controller.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/clear_browsing_data_controller.h" -#include "app/l10n_util.h" #include "base/lazy_instance.h" #include "base/mac/mac_util.h" #include "base/scoped_nsobject.h" @@ -16,6 +15,7 @@ #include "chrome/common/pref_names.h" #include "grit/locale_settings.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util.h" NSString* const kClearBrowsingDataControllerDidDelete = @"kClearBrowsingDataControllerDidDelete"; diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm index 4697bf5..3c94801 100644 --- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm +++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.mm @@ -6,7 +6,6 @@ #include <vector> -#include "app/l10n_util_mac.h" #import "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/profiles/profile.h" @@ -21,6 +20,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm index 20e2686..08970b8 100644 --- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm +++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/logging.h" #include "base/sys_string_conversions.h" @@ -20,6 +19,7 @@ #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/plugins/plugin_list.h" namespace { diff --git a/chrome/browser/ui/cocoa/content_settings/cookie_details.mm b/chrome/browser/ui/cocoa/content_settings/cookie_details.mm index ad085e5..6b87412 100644 --- a/chrome/browser/ui/cocoa/content_settings/cookie_details.mm +++ b/chrome/browser/ui/cocoa/content_settings/cookie_details.mm @@ -4,11 +4,11 @@ #include "chrome/browser/ui/cocoa/content_settings/cookie_details.h" -#include "app/l10n_util_mac.h" #import "base/i18n/time_formatting.h" #include "base/sys_string_conversions.h" #include "grit/generated_resources.h" #include "chrome/browser/cookies_tree_model.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "webkit/appcache/appcache_service.h" #pragma mark Cocoa Cookie Details 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 1448bd7..73e570f 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 @@ -4,11 +4,11 @@ #import "chrome/browser/ui/cocoa/content_settings/cookie_details_view_controller.h" -#include "app/l10n_util_mac.h" #import "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #import "chrome/browser/ui/cocoa/content_settings/cookie_tree_node.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.mm b/chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.mm index 3853b16..b78b269 100644 --- a/chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.mm +++ b/chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.mm @@ -4,13 +4,13 @@ #import "chrome/browser/ui/cocoa/content_settings/simple_content_exceptions_window_controller.h" -#include "app/l10n_util_mac.h" #include "base/logging.h" #import "base/mac/mac_util.h" #import "base/scoped_nsobject.h" #include "base/sys_string_conversions.h" #include "grit/generated_resources.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/models/table_model_observer.h" @interface SimpleContentExceptionsWindowController (Private) diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.mm b/chrome/browser/ui/cocoa/download/download_item_cell.mm index e4d29e6..5e4dedb 100644 --- a/chrome/browser/ui/cocoa/download/download_item_cell.mm +++ b/chrome/browser/ui/cocoa/download/download_item_cell.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/download/download_item_cell.h" -#include "app/l10n_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_item_model.h" @@ -18,6 +17,7 @@ #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #import "third_party/GTM/AppKit/GTMNSColor+Luminance.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/text/text_elider.h" namespace { diff --git a/chrome/browser/ui/cocoa/download/download_item_controller.mm b/chrome/browser/ui/cocoa/download/download_item_controller.mm index 15551d9..d8ab8ad 100644 --- a/chrome/browser/ui/cocoa/download/download_item_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_item_controller.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/download/download_item_controller.h" -#include "app/l10n_util_mac.h" #include "base/mac/mac_util.h" #include "base/metrics/histogram.h" #include "base/string16.h" @@ -25,6 +24,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm index 027dcb16..fea1940 100644 --- a/chrome/browser/ui/cocoa/download/download_shelf_controller.mm +++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/download/download_shelf_controller.h" -#include "app/l10n_util.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/download/download_item.h" @@ -22,6 +21,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" // Download shelf autoclose behavior: diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm index ae0cc90..705276e 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" -#include "app/l10n_util_mac.h" #include "base/sys_string_conversions.h" #include "base/task.h" #include "chrome/browser/browser_list.h" @@ -30,6 +29,7 @@ #include "chrome/common/pref_names.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" // A class that loads the extension icon on the I/O thread before showing the // confirmation dialog to uninstall the given extension. diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt.mm b/chrome/browser/ui/cocoa/extensions/extension_install_prompt.mm index 02a7fe3..5d607d2 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt.mm @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util_mac.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/extension_install_ui.h" @@ -15,6 +14,7 @@ #include "grit/chromium_strings.h" #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" class Profile; diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_controller.mm index 09dc927..6a8fb2b 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_controller.mm @@ -4,8 +4,6 @@ #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_controller.h" -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" #include "base/mac/mac_util.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" @@ -16,6 +14,8 @@ #include "chrome/common/extensions/extension.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm index ae2b312..ec558f2 100644 --- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" @@ -26,6 +25,7 @@ #include "grit/generated_resources.h" #import "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util.h" // C++ class that receives EXTENSION_LOADED notifications and proxies them back diff --git a/chrome/browser/ui/cocoa/external_protocol_dialog.mm b/chrome/browser/ui/cocoa/external_protocol_dialog.mm index 09985c4..d288ec1 100644 --- a/chrome/browser/ui/cocoa/external_protocol_dialog.mm +++ b/chrome/browser/ui/cocoa/external_protocol_dialog.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/external_protocol_dialog.h" -#include "app/l10n_util_mac.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/string_util.h" @@ -13,6 +12,7 @@ #include "chrome/browser/external_protocol_handler.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/text/text_elider.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm index d855b0d..cf29031 100644 --- a/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm +++ b/chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.mm @@ -4,12 +4,12 @@ #import "chrome/browser/ui/cocoa/find_bar/find_bar_text_field_cell.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/cocoa/first_run_bubble_controller.mm b/chrome/browser/ui/cocoa/first_run_bubble_controller.mm index d4fa202..2c68cdc 100644 --- a/chrome/browser/ui/cocoa/first_run_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/first_run_bubble_controller.mm @@ -4,13 +4,13 @@ #import "chrome/browser/ui/cocoa/first_run_bubble_controller.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/search_engines/util.h" #import "chrome/browser/ui/cocoa/l10n_util.h" #import "chrome/browser/ui/cocoa/info_bubble_view.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" @interface FirstRunBubbleController(Private) - (id)initRelativeToView:(NSView*)view diff --git a/chrome/browser/ui/cocoa/first_run_dialog.mm b/chrome/browser/ui/cocoa/first_run_dialog.mm index dae3e4ee..2771dea 100644 --- a/chrome/browser/ui/cocoa/first_run_dialog.mm +++ b/chrome/browser/ui/cocoa/first_run_dialog.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/first_run_dialog.h" -#include "app/l10n_util_mac.h" #include "base/mac/mac_util.h" #include "base/message_loop.h" #include "base/ref_counted.h" @@ -14,6 +13,7 @@ #include "googleurl/src/gurl.h" #include "grit/locale_settings.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util_mac.h" @interface FirstRunDialogController (PrivateMethods) // Show the dialog. diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.mm b/chrome/browser/ui/cocoa/history_menu_bridge.mm index 94d146c..a66feb4 100644 --- a/chrome/browser/ui/cocoa/history_menu_bridge.mm +++ b/chrome/browser/ui/cocoa/history_menu_bridge.mm @@ -4,7 +4,6 @@ #include "chrome/browser/ui/cocoa/history_menu_bridge.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/stl_util-inl.h" #include "base/string_number_conversions.h" @@ -25,6 +24,7 @@ #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/hover_close_button.mm b/chrome/browser/ui/cocoa/hover_close_button.mm index f8e29e2..c276eee 100644 --- a/chrome/browser/ui/cocoa/hover_close_button.mm +++ b/chrome/browser/ui/cocoa/hover_close_button.mm @@ -4,10 +4,10 @@ #import "chrome/browser/ui/cocoa/hover_close_button.h" -#include "app/l10n_util.h" #include "base/scoped_nsobject.h" #include "grit/generated_resources.h" #import "third_party/molokocacao/NSBezierPath+MCAdditions.h" +#include "ui/base/l10n/l10n_util.h" namespace { // Convenience function to return the middle point of the given |rect|. diff --git a/chrome/browser/ui/cocoa/hover_image_button.mm b/chrome/browser/ui/cocoa/hover_image_button.mm index c5bdbf4..a6ae41e 100644 --- a/chrome/browser/ui/cocoa/hover_image_button.mm +++ b/chrome/browser/ui/cocoa/hover_image_button.mm @@ -4,9 +4,9 @@ #import "chrome/browser/ui/cocoa/hover_image_button.h" -#include "app/l10n_util.h" #include "base/scoped_nsobject.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" @implementation HoverImageButton diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm index b5bea2a..2853658 100644 --- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm +++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm @@ -6,7 +6,6 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util_mac.h" #include "base/mac/mac_util.h" #include "base/process_util.h" #include "base/sys_string_conversions.h" @@ -24,6 +23,7 @@ #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/importer/import_progress_dialog.mm b/chrome/browser/ui/cocoa/importer/import_progress_dialog.mm index 4cfbb25..eed979f 100644 --- a/chrome/browser/ui/cocoa/importer/import_progress_dialog.mm +++ b/chrome/browser/ui/cocoa/importer/import_progress_dialog.mm @@ -4,8 +4,6 @@ #import "chrome/browser/ui/cocoa/importer/import_progress_dialog.h" -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/message_loop.h" @@ -14,6 +12,8 @@ #include "base/utf_string_conversions.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/importer/importer_lock_dialog.mm b/chrome/browser/ui/cocoa/importer/importer_lock_dialog.mm index 5796134..a9c95af 100644 --- a/chrome/browser/ui/cocoa/importer/importer_lock_dialog.mm +++ b/chrome/browser/ui/cocoa/importer/importer_lock_dialog.mm @@ -6,12 +6,12 @@ #import "chrome/browser/ui/cocoa/importer/importer_lock_dialog.h" -#include "app/l10n_util_mac.h" #include "base/message_loop.h" #include "base/scoped_nsobject.h" #include "chrome/browser/importer/importer.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" void ImportLockDialogCocoa::ShowWarning(ImporterHost* importer) { scoped_nsobject<NSAlert> lock_alert([[NSAlert alloc] init]); diff --git a/chrome/browser/ui/cocoa/install_from_dmg.mm b/chrome/browser/ui/cocoa/install_from_dmg.mm index aa892cf..d551b61 100644 --- a/chrome/browser/ui/cocoa/install_from_dmg.mm +++ b/chrome/browser/ui/cocoa/install_from_dmg.mm @@ -13,8 +13,6 @@ #include <sys/param.h> #include <sys/mount.h> -#include "app/l10n_util.h" -#import "app/l10n_util_mac.h" #include "base/basictypes.h" #include "base/command_line.h" #include "base/logging.h" @@ -25,6 +23,8 @@ #import "chrome/browser/ui/cocoa/keystone_glue.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" // When C++ exceptions are disabled, the C++ library defines |try| and // |catch| so as to allow exception-expecting C++ code to build properly when diff --git a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm index e0fd72c..62825d5 100644 --- a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm +++ b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm @@ -6,7 +6,6 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util_mac.h" #include "base/logging.h" #import "base/mac/cocoa_protocols.h" #include "base/sys_string_conversions.h" @@ -14,6 +13,7 @@ #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "grit/app_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/message_box_flags.h" // Helper object that receives the notification that the dialog/sheet is diff --git a/chrome/browser/ui/cocoa/keystone_glue.mm b/chrome/browser/ui/cocoa/keystone_glue.mm index 8ac3daf..7f3ddd6 100644 --- a/chrome/browser/ui/cocoa/keystone_glue.mm +++ b/chrome/browser/ui/cocoa/keystone_glue.mm @@ -9,8 +9,6 @@ #include <vector> -#include "app/l10n_util.h" -#import "app/l10n_util_mac.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_nsautorelease_pool.h" @@ -22,6 +20,8 @@ #include "chrome/common/chrome_constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/keystone_infobar.mm b/chrome/browser/ui/cocoa/keystone_infobar.mm index a94aa22..39df317 100644 --- a/chrome/browser/ui/cocoa/keystone_infobar.mm +++ b/chrome/browser/ui/cocoa/keystone_infobar.mm @@ -8,7 +8,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/message_loop.h" #include "base/task.h" @@ -26,6 +25,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" class SkBitmap; diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm index 69a3bfb..0b89491 100644 --- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm +++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_editor.h" -#include "app/l10n_util_mac.h" #include "base/string_util.h" #include "grit/generated_resources.h" #include "base/sys_string_conversions.h" @@ -14,6 +13,7 @@ #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h" #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h" #import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" +#include "ui/base/l10n/l10n_util_mac.h" @implementation AutocompleteTextFieldEditor diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm index 536b701..da3475d 100644 --- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/sys_string_conversions.h" #include "base/utf_string_conversions.h" @@ -21,6 +20,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm index 97d19c8..d9c620a 100644 --- a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.mm @@ -6,7 +6,6 @@ #import "chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" @@ -14,6 +13,7 @@ #include "grit/theme_resources.h" #include "grit/generated_resources.h" #include "skia/ext/skia_utils_mac.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { 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 692ae96..f9071ab 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 @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" -#include "app/l10n_util_mac.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" @@ -52,6 +51,7 @@ #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm index 6aa6505..fae0cc4 100644 --- a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.mm @@ -4,13 +4,13 @@ #import "chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h" -#include "app/l10n_util_mac.h" #include "base/utf_string_conversions.h" #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" #import "chrome/browser/ui/cocoa/image_utils.h" #include "chrome/browser/ui/omnibox/location_bar_util.h" #include "grit/theme_resources.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" SelectedKeywordDecoration::SelectedKeywordDecoration(NSFont* font) : BubbleDecoration(font) { diff --git a/chrome/browser/ui/cocoa/location_bar/star_decoration.mm b/chrome/browser/ui/cocoa/location_bar/star_decoration.mm index 2ac3450..d089e7b0 100644 --- a/chrome/browser/ui/cocoa/location_bar/star_decoration.mm +++ b/chrome/browser/ui/cocoa/location_bar/star_decoration.mm @@ -4,12 +4,12 @@ #import "chrome/browser/ui/cocoa/location_bar/star_decoration.h" -#include "app/l10n_util_mac.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/autocomplete/autocomplete_edit_view_mac.h" #include "chrome/browser/command_updater.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/menu_controller.mm b/chrome/browser/ui/cocoa/menu_controller.mm index c13b4fe..8e58ae7 100644 --- a/chrome/browser/ui/cocoa/menu_controller.mm +++ b/chrome/browser/ui/cocoa/menu_controller.mm @@ -4,11 +4,11 @@ #import "chrome/browser/ui/cocoa/menu_controller.h" -#include "app/l10n_util_mac.h" #include "base/logging.h" #include "base/sys_string_conversions.h" #include "skia/ext/skia_utils_mac.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/models/accelerator_cocoa.h" #include "ui/base/models/simple_menu_model.h" diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm index a927081..9b1b5a0 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm @@ -4,7 +4,6 @@ #include "chrome/browser/ui/cocoa/notifications/balloon_controller.h" -#include "app/l10n_util.h" #include "app/mac/nsimage_cache.h" #import "base/mac/cocoa_protocols.h" #include "base/mac/mac_util.h" @@ -22,6 +21,7 @@ #include "chrome/browser/ui/cocoa/notifications/balloon_view_host_mac.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 { diff --git a/chrome/browser/ui/cocoa/options/content_exceptions_window_controller.mm b/chrome/browser/ui/cocoa/options/content_exceptions_window_controller.mm index 80328e2..a5141de 100644 --- a/chrome/browser/ui/cocoa/options/content_exceptions_window_controller.mm +++ b/chrome/browser/ui/cocoa/options/content_exceptions_window_controller.mm @@ -4,8 +4,6 @@ #import "chrome/browser/ui/cocoa/options/content_exceptions_window_controller.h" -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" #include "base/command_line.h" #import "base/mac/mac_util.h" #import "base/scoped_nsobject.h" @@ -16,6 +14,8 @@ #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/models/table_model_observer.h" @interface ContentExceptionsWindowController (Private) diff --git a/chrome/browser/ui/cocoa/options/content_settings_dialog_controller.mm b/chrome/browser/ui/cocoa/options/content_settings_dialog_controller.mm index c164584..5186bcb 100644 --- a/chrome/browser/ui/cocoa/options/content_settings_dialog_controller.mm +++ b/chrome/browser/ui/cocoa/options/content_settings_dialog_controller.mm @@ -6,7 +6,6 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/mac/mac_util.h" #import "chrome/browser/content_settings/content_settings_details.h" @@ -31,6 +30,7 @@ #include "chrome/common/url_constants.h" #include "grit/locale_settings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/cocoa/options/cookies_window_controller.mm b/chrome/browser/ui/cocoa/options/cookies_window_controller.mm index ae5dc9e..7c9c812 100644 --- a/chrome/browser/ui/cocoa/options/cookies_window_controller.mm +++ b/chrome/browser/ui/cocoa/options/cookies_window_controller.mm @@ -7,7 +7,6 @@ #include <queue> #include <vector> -#include "app/l10n_util_mac.h" #import "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/browsing_data_remover.h" @@ -19,6 +18,7 @@ #include "skia/ext/skia_utils_mac.h" #include "third_party/apple/ImageAndTextCell.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" // Key path used for notifying KVO. diff --git a/chrome/browser/ui/cocoa/options/cookies_window_controller_unittest.mm b/chrome/browser/ui/cocoa/options/cookies_window_controller_unittest.mm index 71ad1f5..119f67b 100644 --- a/chrome/browser/ui/cocoa/options/cookies_window_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/options/cookies_window_controller_unittest.mm @@ -4,7 +4,6 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util_mac.h" #import "base/scoped_nsobject.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" @@ -28,6 +27,7 @@ #import "testing/gtest_mac.h" #include "testing/platform_test.h" #import "third_party/ocmock/OCMock/OCMock.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/models/tree_model.h" // Used to test FindCocoaNode. This only sets the title and node, without diff --git a/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm b/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm index 1428697..a77d2ae 100644 --- a/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm +++ b/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller.h" -#include "app/l10n_util_mac.h" #include "base/logging.h" #import "base/mac/mac_util.h" #include "base/string16.h" @@ -14,6 +13,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller_unittest.mm index 93ed9f8..90e0a49 100644 --- a/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/options/edit_search_engine_cocoa_controller_unittest.mm @@ -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_mac.h" #include "base/scoped_nsobject.h" #include "base/utf_string_conversions.h" #include "chrome/browser/search_engines/template_url.h" @@ -14,6 +13,7 @@ #include "testing/gtest/include/gtest/gtest.h" #import "testing/gtest_mac.h" #include "testing/platform_test.h" +#include "ui/base/l10n/l10n_util_mac.h" @interface FakeEditSearchEngineController : EditSearchEngineCocoaController { } diff --git a/chrome/browser/ui/cocoa/options/preferences_window_controller.mm b/chrome/browser/ui/cocoa/options/preferences_window_controller.mm index e8e73eb..e6c771b 100644 --- a/chrome/browser/ui/cocoa/options/preferences_window_controller.mm +++ b/chrome/browser/ui/cocoa/options/preferences_window_controller.mm @@ -6,8 +6,7 @@ #include <algorithm> -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" +#include "ui/base/l10n/l10n_util.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_aedesc.h" @@ -64,6 +63,7 @@ #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/cocoa/page_info_bubble_controller.mm b/chrome/browser/ui/cocoa/page_info_bubble_controller.mm index e0a13f6..bd05241 100644 --- a/chrome/browser/ui/cocoa/page_info_bubble_controller.mm +++ b/chrome/browser/ui/cocoa/page_info_bubble_controller.mm @@ -4,8 +4,6 @@ #import "chrome/browser/ui/cocoa/page_info_bubble_controller.h" -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" #include "base/message_loop.h" #include "base/sys_string_conversions.h" #include "base/task.h" @@ -25,6 +23,8 @@ #include "net/base/cert_status_flags.h" #include "net/base/x509_certificate.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" @interface PageInfoBubbleController (Private) - (PageInfoModel*)model; diff --git a/chrome/browser/ui/cocoa/page_info_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/page_info_bubble_controller_unittest.mm index 50281fe..0ad5054 100644 --- a/chrome/browser/ui/cocoa/page_info_bubble_controller_unittest.mm +++ b/chrome/browser/ui/cocoa/page_info_bubble_controller_unittest.mm @@ -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_nsobject.h" #include "base/string_util.h" #include "base/string_number_conversions.h" @@ -14,6 +13,7 @@ #include "chrome/browser/ui/cocoa/browser_test_helper.h" #import "chrome/browser/ui/cocoa/cocoa_test_helper.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/cocoa/repost_form_warning_mac.mm b/chrome/browser/ui/cocoa/repost_form_warning_mac.mm index 71f292b..3bcbaf1 100644 --- a/chrome/browser/ui/cocoa/repost_form_warning_mac.mm +++ b/chrome/browser/ui/cocoa/repost_form_warning_mac.mm @@ -4,10 +4,10 @@ #include "chrome/browser/ui/cocoa/repost_form_warning_mac.h" -#include "app/l10n_util_mac.h" #include "base/scoped_nsobject.h" #include "chrome/browser/repost_form_warning_controller.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" // The delegate of the NSAlert used to display the dialog. Forwards the alert's // completion event to the C++ class |RepostFormWarningController|. diff --git a/chrome/browser/ui/cocoa/restart_browser.mm b/chrome/browser/ui/cocoa/restart_browser.mm index c88715a..c5a0790 100644 --- a/chrome/browser/ui/cocoa/restart_browser.mm +++ b/chrome/browser/ui/cocoa/restart_browser.mm @@ -4,8 +4,6 @@ #import "chrome/browser/ui/cocoa/restart_browser.h" -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" @@ -13,6 +11,8 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/app_strings.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" // Helper to clean up after the notification that the alert was dismissed. @interface RestartHelper : NSObject { diff --git a/chrome/browser/ui/cocoa/search_engine_dialog_controller.mm b/chrome/browser/ui/cocoa/search_engine_dialog_controller.mm index 595ea31..6c5757e 100644 --- a/chrome/browser/ui/cocoa/search_engine_dialog_controller.mm +++ b/chrome/browser/ui/cocoa/search_engine_dialog_controller.mm @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util_mac.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "base/time.h" @@ -17,6 +16,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" // Horizontal spacing between search engine choices. diff --git a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm index 24b1bc9..a27bc25 100644 --- a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm +++ b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm @@ -11,7 +11,6 @@ #include <set> #include <vector> -#include "app/l10n_util_mac.h" #include "base/file_util.h" #include "base/logging.h" #import "base/mac/cocoa_protocols.h" @@ -21,6 +20,7 @@ #include "base/sys_string_conversions.h" #include "base/threading/thread_restrictions.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" static const int kFileTypePopupTag = 1234; diff --git a/chrome/browser/ui/cocoa/speech_input_window_controller.mm b/chrome/browser/ui/cocoa/speech_input_window_controller.mm index 8024c5c6..000424d 100644 --- a/chrome/browser/ui/cocoa/speech_input_window_controller.mm +++ b/chrome/browser/ui/cocoa/speech_input_window_controller.mm @@ -4,7 +4,6 @@ #import "speech_input_window_controller.h" -#include "app/l10n_util_mac.h" #include "base/logging.h" #include "base/sys_string_conversions.h" #include "chrome/browser/ui/cocoa/info_bubble_view.h" @@ -12,6 +11,7 @@ #include "grit/theme_resources.h" #import "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" const int kBubbleControlVerticalSpacing = 10; // Space between controls. diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm index 3f0a2f5..729ce1c 100644 --- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm +++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector.mm @@ -8,7 +8,6 @@ #include <vector> -#import "app/l10n_util_mac.h" #include "base/logging.h" #include "base/ref_counted.h" #import "base/scoped_nsobject.h" @@ -21,6 +20,7 @@ #import "chrome/browser/ui/cocoa/constrained_window_mac.h" #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_controller.mm index e28e7fc..2bac5d3 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_controller.mm @@ -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_mac.h" #include "base/mac/mac_util.h" #import "chrome/browser/themes/browser_theme_provider.h" #import "chrome/browser/ui/cocoa/menu_controller.h" @@ -12,6 +11,7 @@ #import "chrome/browser/ui/cocoa/themed_window.h" #import "chrome/common/extensions/extension.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" @implementation TabController diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index 432d3d5..755c8c9 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -9,7 +9,6 @@ #include <limits> #include <string> -#include "app/l10n_util.h" #include "app/mac/nsimage_cache.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" @@ -47,6 +46,7 @@ #include "grit/theme_resources.h" #include "skia/ext/skia_utils_mac.h" #import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged"; diff --git a/chrome/browser/ui/cocoa/task_manager_mac.mm b/chrome/browser/ui/cocoa/task_manager_mac.mm index 28cbba0..21b0b9d 100644 --- a/chrome/browser/ui/cocoa/task_manager_mac.mm +++ b/chrome/browser/ui/cocoa/task_manager_mac.mm @@ -7,7 +7,6 @@ #include <algorithm> #include <vector> -#include "app/l10n_util_mac.h" #include "base/mac/mac_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/browser_process.h" @@ -15,6 +14,7 @@ #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/theme_install_bubble_view.mm b/chrome/browser/ui/cocoa/theme_install_bubble_view.mm index 9841230..076aabd 100644 --- a/chrome/browser/ui/cocoa/theme_install_bubble_view.mm +++ b/chrome/browser/ui/cocoa/theme_install_bubble_view.mm @@ -6,10 +6,10 @@ #import "chrome/browser/ui/cocoa/theme_install_bubble_view.h" -#include "app/l10n_util_mac.h" #include "base/scoped_nsobject.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/toolbar/reload_button.mm b/chrome/browser/ui/cocoa/toolbar/reload_button.mm index 41dc176..a00ee25 100644 --- a/chrome/browser/ui/cocoa/toolbar/reload_button.mm +++ b/chrome/browser/ui/cocoa/toolbar/reload_button.mm @@ -4,13 +4,13 @@ #import "chrome/browser/ui/cocoa/toolbar/reload_button.h" -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" +#include "ui/base/l10n/l10n_util.h" #include "app/mac/nsimage_cache.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/ui/cocoa/gradient_button_cell.h" #import "chrome/browser/ui/cocoa/view_id_util.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm index 7ff1824..7a25aca 100644 --- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm +++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm @@ -6,8 +6,7 @@ #include <algorithm> -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" +#include "ui/base/l10n/l10n_util.h" #include "app/mac/nsimage_cache.h" #include "base/mac/mac_util.h" #include "base/singleton.h" @@ -54,6 +53,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/models/accelerator_cocoa.h" #include "ui/base/models/menu_model.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/cocoa/translate/before_translate_infobar_controller.mm b/chrome/browser/ui/cocoa/translate/before_translate_infobar_controller.mm index 0beedad..35c2bf4 100644 --- a/chrome/browser/ui/cocoa/translate/before_translate_infobar_controller.mm +++ b/chrome/browser/ui/cocoa/translate/before_translate_infobar_controller.mm @@ -4,9 +4,9 @@ #include "chrome/browser/ui/cocoa/translate/before_translate_infobar_controller.h" -#include "app/l10n_util.h" #include "base/sys_string_conversions.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" using TranslateInfoBarUtilities::MoveControl; using TranslateInfoBarUtilities::VerifyControlOrderAndSpacing; diff --git a/chrome/browser/ui/cocoa/translate/translate_infobar_base.mm b/chrome/browser/ui/cocoa/translate/translate_infobar_base.mm index c26a140..44dc96d 100644 --- a/chrome/browser/ui/cocoa/translate/translate_infobar_base.mm +++ b/chrome/browser/ui/cocoa/translate/translate_infobar_base.mm @@ -5,7 +5,6 @@ #import <Cocoa/Cocoa.h> #import "chrome/browser/ui/cocoa/translate/translate_infobar_base.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/sys_string_conversions.h" @@ -20,6 +19,7 @@ #include "chrome/browser/ui/cocoa/translate/translate_message_infobar_controller.h" #include "grit/generated_resources.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util.h" using TranslateInfoBarUtilities::MoveControl; using TranslateInfoBarUtilities::VerticallyCenterView; diff --git a/chrome/browser/ui/cocoa/ui_localizer.mm b/chrome/browser/ui/cocoa/ui_localizer.mm index fc2e97e..5268319 100644 --- a/chrome/browser/ui/cocoa/ui_localizer.mm +++ b/chrome/browser/ui/cocoa/ui_localizer.mm @@ -7,13 +7,13 @@ #import <Foundation/Foundation.h> #include <stdlib.h> -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" #include "base/sys_string_conversions.h" #include "base/logging.h" #include "grit/app_strings.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" struct UILocalizerResourceMap { const char* const name; diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm index 7ca6b17..d4167bf 100644 --- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm +++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm @@ -4,7 +4,6 @@ #import "chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.h" -#include "app/l10n_util.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/background_page_tracker.h" @@ -20,6 +19,7 @@ #include "chrome/common/notification_type.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/menu_model.h" @interface WrenchMenuController (Private) diff --git a/chrome/browser/ui/gtk/about_chrome_dialog.cc b/chrome/browser/ui/gtk/about_chrome_dialog.cc index 65c44d3..c62dabb 100644 --- a/chrome/browser/ui/gtk/about_chrome_dialog.cc +++ b/chrome/browser/ui/gtk/about_chrome_dialog.cc @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/google/google_util.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/ui/gtk/accessible_widget_helper_gtk.cc b/chrome/browser/ui/gtk/accessible_widget_helper_gtk.cc index b25203f..eb449ef 100644 --- a/chrome/browser/ui/gtk/accessible_widget_helper_gtk.cc +++ b/chrome/browser/ui/gtk/accessible_widget_helper_gtk.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h" -#include "app/l10n_util.h" #include "chrome/browser/accessibility_events.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/notification_service.h" +#include "ui/base/l10n/l10n_util.h" AccessibleWidgetHelper::AccessibleWidgetHelper( GtkWidget* root_widget, Profile* profile) diff --git a/chrome/browser/ui/gtk/back_forward_button_gtk.cc b/chrome/browser/ui/gtk/back_forward_button_gtk.cc index 6eed194..f7b7094 100644 --- a/chrome/browser/ui/gtk/back_forward_button_gtk.cc +++ b/chrome/browser/ui/gtk/back_forward_button_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h" @@ -17,6 +16,7 @@ #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" // The time in milliseconds between when the user clicks and the menu appears. static const int kMenuTimerDelay = 500; diff --git a/chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.cc b/chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.cc index 921e72c..522861e 100644 --- a/chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.cc +++ b/chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/gtk/bookmark_bar_instructions_gtk.h" -#include "app/l10n_util.h" #include "base/observer_list.h" #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" #include "chrome/browser/ui/gtk/gtk_chrome_shrinkable_hbox.h" @@ -12,6 +11,7 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" BookmarkBarInstructionsGtk::BookmarkBarInstructionsGtk(Delegate* delegate, Profile* profile) diff --git a/chrome/browser/ui/gtk/bookmark_bubble_gtk.cc b/chrome/browser/ui/gtk/bookmark_bubble_gtk.cc index 3173c79..307953b 100644 --- a/chrome/browser/ui/gtk/bookmark_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/bookmark_bubble_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/i18n/rtl.h" #include "base/logging.h" @@ -25,6 +24,7 @@ #include "chrome/browser/ui/gtk/info_bubble_gtk.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/bookmark_editor_gtk.cc b/chrome/browser/ui/gtk/bookmark_editor_gtk.cc index c857295..788ed60 100644 --- a/chrome/browser/ui/gtk/bookmark_editor_gtk.cc +++ b/chrome/browser/ui/gtk/bookmark_editor_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/logging.h" #include "base/string_util.h" @@ -26,6 +25,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/models/simple_menu_model.h" #if defined(TOOLKIT_VIEWS) diff --git a/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc b/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc index b90cd17..61a44c2 100644 --- a/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc +++ b/chrome/browser/ui/gtk/bookmark_menu_controller_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -23,6 +22,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/dragdrop/gtk_dnd_util.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/window_open_disposition.h" namespace { diff --git a/chrome/browser/ui/gtk/bookmark_utils_gtk.cc b/chrome/browser/ui/gtk/bookmark_utils_gtk.cc index 2be5242..e96dec7 100644 --- a/chrome/browser/ui/gtk/bookmark_utils_gtk.cc +++ b/chrome/browser/ui/gtk/bookmark_utils_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/gtk/bookmark_utils_gtk.h" -#include "app/l10n_util.h" #include "base/pickle.h" #include "base/string16.h" #include "base/string_util.h" @@ -20,6 +19,7 @@ #include "gfx/font.h" #include "gfx/gtk_util.h" #include "ui/base/dragdrop/gtk_dnd_util.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/browser_titlebar.cc b/chrome/browser/ui/gtk/browser_titlebar.cc index 920cefa..58f1236 100644 --- a/chrome/browser/ui/gtk/browser_titlebar.cc +++ b/chrome/browser/ui/gtk/browser_titlebar.cc @@ -10,7 +10,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/singleton.h" #include "base/string_piece.h" @@ -41,6 +40,7 @@ #include "grit/app_resources.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 { diff --git a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc index 39b3339..7ee3b34 100644 --- a/chrome/browser/ui/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/ui/gtk/browser_toolbar_gtk.cc @@ -8,7 +8,6 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/i18n/rtl.h" @@ -52,6 +51,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/dragdrop/gtk_dnd_util.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/accelerator_gtk.h" namespace { diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc index 6b18b39..79781b9 100644 --- a/chrome/browser/ui/gtk/browser_window_gtk.cc +++ b/chrome/browser/ui/gtk/browser_window_gtk.cc @@ -8,7 +8,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/logging.h" @@ -87,6 +86,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/certificate_dialogs.cc b/chrome/browser/ui/gtk/certificate_dialogs.cc index b231dc3..b129ea7 100644 --- a/chrome/browser/ui/gtk/certificate_dialogs.cc +++ b/chrome/browser/ui/gtk/certificate_dialogs.cc @@ -9,7 +9,6 @@ #include <vector> -#include "app/l10n_util.h" #include "base/base64.h" #include "base/file_util.h" #include "base/logging.h" @@ -19,6 +18,7 @@ #include "chrome/browser/shell_dialogs.h" #include "chrome/common/net/x509_certificate_model.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/certificate_viewer.cc b/chrome/browser/ui/gtk/certificate_viewer.cc index 550aab0..ca2244f 100644 --- a/chrome/browser/ui/gtk/certificate_viewer.cc +++ b/chrome/browser/ui/gtk/certificate_viewer.cc @@ -9,7 +9,6 @@ #include <algorithm> #include <vector> -#include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/nss_util.h" #include "base/scoped_ptr.h" @@ -22,6 +21,7 @@ #include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/clear_browsing_data_dialog_gtk.cc b/chrome/browser/ui/gtk/clear_browsing_data_dialog_gtk.cc index 5544f589..5cf1cbc 100644 --- a/chrome/browser/ui/gtk/clear_browsing_data_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/clear_browsing_data_dialog_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "chrome/browser/browsing_data_remover.h" #include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/profiles/profile.h" @@ -18,6 +17,7 @@ #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/collected_cookies_gtk.cc b/chrome/browser/ui/gtk/collected_cookies_gtk.cc index a8ef604..2c2349e 100644 --- a/chrome/browser/ui/gtk/collected_cookies_gtk.cc +++ b/chrome/browser/ui/gtk/collected_cookies_gtk.cc @@ -6,13 +6,13 @@ #include <string> -#include "app/l10n_util.h" #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/notification_source.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { // Width and height of the cookie tree view. diff --git a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc index 0a0b8ea..b9d8143 100644 --- a/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/content_setting_bubble_gtk.cc @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/blocked_content_container.h" @@ -26,6 +25,7 @@ #include "gfx/gtk_util.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/text/text_elider.h" #include "webkit/plugins/npapi/plugin_list.h" diff --git a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc index ab6ffa9..0c83648 100644 --- a/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/create_application_shortcuts_dialog_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/environment.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" @@ -21,6 +20,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc index 1429e5f..d36146b 100644 --- a/chrome/browser/ui/gtk/crypto_module_password_dialog.cc +++ b/chrome/browser/ui/gtk/crypto_module_password_dialog.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/crypto/crypto_module_blocking_password_delegate.h" #include "base/synchronization/waitable_event.h" @@ -17,6 +16,7 @@ #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/dialogs_gtk.cc b/chrome/browser/ui/gtk/dialogs_gtk.cc index caab944..8768e2d 100644 --- a/chrome/browser/ui/gtk/dialogs_gtk.cc +++ b/chrome/browser/ui/gtk/dialogs_gtk.cc @@ -6,7 +6,6 @@ #include <map> #include <set> -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/logging.h" #include "base/message_loop.h" @@ -19,6 +18,7 @@ #include "chrome/browser/shell_dialogs.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/base/l10n/l10n_util.h" // The size of the preview we display for selected image files. We set height // larger than width because generally there is more free space vertically diff --git a/chrome/browser/ui/gtk/download_in_progress_dialog_gtk.cc b/chrome/browser/ui/gtk/download_in_progress_dialog_gtk.cc index 0db12cb..de3cb31 100644 --- a/chrome/browser/ui/gtk/download_in_progress_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/download_in_progress_dialog_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/string16.h" #include "base/string_number_conversions.h" #include "chrome/browser/download/download_manager.h" @@ -16,6 +15,7 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" DownloadInProgressDialogGtk::DownloadInProgressDialogGtk(Browser* browser) : browser_(browser) { diff --git a/chrome/browser/ui/gtk/download_item_gtk.cc b/chrome/browser/ui/gtk/download_item_gtk.cc index 4e7fb71..47fd751 100644 --- a/chrome/browser/ui/gtk/download_item_gtk.cc +++ b/chrome/browser/ui/gtk/download_item_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/gtk/download_item_gtk.h" -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/callback.h" #include "base/metrics/histogram.h" @@ -33,6 +32,7 @@ #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" diff --git a/chrome/browser/ui/gtk/download_shelf_gtk.cc b/chrome/browser/ui/gtk/download_shelf_gtk.cc index ff49223..a964b1c 100644 --- a/chrome/browser/ui/gtk/download_shelf_gtk.cc +++ b/chrome/browser/ui/gtk/download_shelf_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "chrome/browser/download/download_item.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_util.h" @@ -22,6 +21,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" namespace { diff --git a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc index 188d3ce..b7a7d8f 100644 --- a/chrome/browser/ui/gtk/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/gtk/edit_search_engine_dialog.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" @@ -21,6 +20,7 @@ #include "grit/app_resources.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 { diff --git a/chrome/browser/ui/gtk/extension_install_prompt2_gtk.cc b/chrome/browser/ui/gtk/extension_install_prompt2_gtk.cc index 8e41357..4437fc4 100644 --- a/chrome/browser/ui/gtk/extension_install_prompt2_gtk.cc +++ b/chrome/browser/ui/gtk/extension_install_prompt2_gtk.cc @@ -4,7 +4,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -16,6 +15,7 @@ #include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "skia/ext/image_operations.h" +#include "ui/base/l10n/l10n_util.h" class Profile; diff --git a/chrome/browser/ui/gtk/extension_install_prompt_gtk.cc b/chrome/browser/ui/gtk/extension_install_prompt_gtk.cc index 3a6134d1..70c89cd 100644 --- a/chrome/browser/ui/gtk/extension_install_prompt_gtk.cc +++ b/chrome/browser/ui/gtk/extension_install_prompt_gtk.cc @@ -7,7 +7,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -18,6 +17,7 @@ #include "chrome/common/extensions/extension.h" #include "gfx/gtk_util.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" class Profile; diff --git a/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc b/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc index e900ca8..65e5689 100644 --- a/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/extension_installed_bubble_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" @@ -25,6 +24,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" namespace { diff --git a/chrome/browser/ui/gtk/external_protocol_dialog_gtk.cc b/chrome/browser/ui/gtk/external_protocol_dialog_gtk.cc index 57f3374..d489ffe 100644 --- a/chrome/browser/ui/gtk/external_protocol_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/external_protocol_dialog_gtk.cc @@ -8,7 +8,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/metrics/histogram.h" #include "base/string_util.h" @@ -18,6 +17,7 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/text/text_elider.h" namespace { diff --git a/chrome/browser/ui/gtk/find_bar_gtk.cc b/chrome/browser/ui/gtk/find_bar_gtk.cc index 36e4bdd..55b30b0 100644 --- a/chrome/browser/ui/gtk/find_bar_gtk.cc +++ b/chrome/browser/ui/gtk/find_bar_gtk.cc @@ -10,7 +10,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/string_number_conversions.h" #include "base/string_util.h" @@ -36,6 +35,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" namespace { diff --git a/chrome/browser/ui/gtk/first_run_bubble.cc b/chrome/browser/ui/gtk/first_run_bubble.cc index 6528658..a1b5b73 100644 --- a/chrome/browser/ui/gtk/first_run_bubble.cc +++ b/chrome/browser/ui/gtk/first_run_bubble.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" @@ -19,6 +18,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" namespace { // Markup for the text of the Omnibox search label diff --git a/chrome/browser/ui/gtk/first_run_dialog.cc b/chrome/browser/ui/gtk/first_run_dialog.cc index 677e959..2cff0cd 100644 --- a/chrome/browser/ui/gtk/first_run_dialog.cc +++ b/chrome/browser/ui/gtk/first_run_dialog.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" @@ -28,6 +27,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" #if defined(USE_LINUX_BREAKPAD) diff --git a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc index 2970685..fec4b12 100644 --- a/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.cc @@ -4,13 +4,13 @@ #include "chrome/browser/ui/gtk/fullscreen_exit_bubble_gtk.h" -#include "app/l10n_util.h" #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" #include "chrome/browser/ui/gtk/gtk_floating_container.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/rounded_window.h" #include "grit/app_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc index 84174d6..a7bac57 100644 --- a/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc +++ b/chrome/browser/ui/gtk/gtk_chrome_cookie_view.cc @@ -4,11 +4,11 @@ #include "chrome/browser/ui/gtk/gtk_chrome_cookie_view.h" -#include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index 9de26c2..dc86954 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -11,7 +11,6 @@ #include <cstdarg> #include <map> -#include "app/l10n_util.h" #include "base/environment.h" #include "base/i18n/rtl.h" #include "base/linux_util.h" @@ -35,6 +34,7 @@ #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.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/x/x11_util.h" diff --git a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc index 10880df..6ed0c69 100644 --- a/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/hung_renderer_dialog_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/process_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -21,6 +20,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/import_dialog_gtk.cc b/chrome/browser/ui/gtk/import_dialog_gtk.cc index 3d1a815..10d77aa 100644 --- a/chrome/browser/ui/gtk/import_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/import_dialog_gtk.cc @@ -6,13 +6,13 @@ #include <string> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/importer/importer_data_types.h" #include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/import_lock_dialog_gtk.cc b/chrome/browser/ui/gtk/import_lock_dialog_gtk.cc index 54313fd..4d82d52 100644 --- a/chrome/browser/ui/gtk/import_lock_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/import_lock_dialog_gtk.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ui/gtk/import_lock_dialog_gtk.h" -#include "app/l10n_util.h" #include "base/message_loop.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" // static void ImportLockDialogGtk::Show(GtkWindow* parent, ImporterHost* importer_host) { diff --git a/chrome/browser/ui/gtk/import_progress_dialog_gtk.cc b/chrome/browser/ui/gtk/import_progress_dialog_gtk.cc index 56fd465..d72a45f 100644 --- a/chrome/browser/ui/gtk/import_progress_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/import_progress_dialog_gtk.cc @@ -6,11 +6,11 @@ #include <string> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" using importer::ALL; using importer::BOOKMARKS_HTML; diff --git a/chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc b/chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc index 38722e4..446428c 100644 --- a/chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "chrome/browser/instant/instant_confirm_dialog.h" #include "chrome/browser/instant/instant_controller.h" #include "chrome/browser/profiles/profile.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" namespace browser { diff --git a/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc b/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc index 376e3ce..8d577bc 100644 --- a/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/js_modal_dialog_gtk.cc @@ -6,13 +6,13 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" namespace { diff --git a/chrome/browser/ui/gtk/keyword_editor_view.cc b/chrome/browser/ui/gtk/keyword_editor_view.cc index 785ea34..78eda6c 100644 --- a/chrome/browser/ui/gtk/keyword_editor_view.cc +++ b/chrome/browser/ui/gtk/keyword_editor_view.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/metrics/user_metrics.h" @@ -23,6 +22,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc index 30d5f03..177d422 100644 --- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc +++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/command_line.h" #include "base/i18n/rtl.h" @@ -60,6 +59,7 @@ #include "grit/theme_resources.h" #include "net/base/net_util.h" #include "ui/base/dragdrop/gtk_dnd_util.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/glue/window_open_disposition.h" diff --git a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc index 7c97a8d..4b7c2eb 100644 --- a/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc +++ b/chrome/browser/ui/gtk/notifications/balloon_view_gtk.cc @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/browser_list.h" @@ -42,6 +41,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/options/advanced_contents_gtk.cc b/chrome/browser/ui/gtk/options/advanced_contents_gtk.cc index e8ad344..c1a08dd 100644 --- a/chrome/browser/ui/gtk/options/advanced_contents_gtk.cc +++ b/chrome/browser/ui/gtk/options/advanced_contents_gtk.cc @@ -10,7 +10,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/command_line.h" #include "base/environment.h" @@ -47,6 +46,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/advanced_page_gtk.cc b/chrome/browser/ui/gtk/options/advanced_page_gtk.cc index 54e7b82..3c7c354 100644 --- a/chrome/browser/ui/gtk/options/advanced_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/advanced_page_gtk.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ui/gtk/options/advanced_page_gtk.h" -#include "app/l10n_util.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/options/options_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" AdvancedPageGtk::AdvancedPageGtk(Profile* profile) : OptionsPageBase(profile), diff --git a/chrome/browser/ui/gtk/options/content_exception_editor.cc b/chrome/browser/ui/gtk/options/content_exception_editor.cc index c899391..1b5eadc 100644 --- a/chrome/browser/ui/gtk/options/content_exception_editor.cc +++ b/chrome/browser/ui/gtk/options/content_exception_editor.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/gtk/options/content_exception_editor.h" -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_exceptions_table_model.h" @@ -13,6 +12,7 @@ #include "grit/app_resources.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" ContentExceptionEditor::ContentExceptionEditor( diff --git a/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.cc b/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.cc index 191dae6..42e3d9c 100644 --- a/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.cc +++ b/chrome/browser/ui/gtk/options/content_exceptions_window_gtk.cc @@ -6,7 +6,6 @@ #include <set> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_util.h" @@ -14,6 +13,7 @@ #include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/content_filter_page_gtk.cc b/chrome/browser/ui/gtk/options/content_filter_page_gtk.cc index 4ec5656..4d60dcd3 100644 --- a/chrome/browser/ui/gtk/options/content_filter_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/content_filter_page_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/gtk/options/content_filter_page_gtk.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "chrome/browser/content_settings/content_settings_details.h" #include "chrome/browser/content_settings/content_settings_pattern.h" @@ -28,6 +27,7 @@ #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" ContentFilterPageGtk::ContentFilterPageGtk(Profile* profile, ContentSettingsType content_type) diff --git a/chrome/browser/ui/gtk/options/content_page_gtk.cc b/chrome/browser/ui/gtk/options/content_page_gtk.cc index fe3fddc..621349f 100644 --- a/chrome/browser/ui/gtk/options/content_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/content_page_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" @@ -30,6 +29,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/chromeos/options/options_window_view.h" diff --git a/chrome/browser/ui/gtk/options/content_settings_window_gtk.cc b/chrome/browser/ui/gtk/options/content_settings_window_gtk.cc index d971a23..527419a 100644 --- a/chrome/browser/ui/gtk/options/content_settings_window_gtk.cc +++ b/chrome/browser/ui/gtk/options/content_settings_window_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/message_loop.h" #include "chrome/browser/prefs/pref_service.h" @@ -21,6 +20,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/cookie_filter_page_gtk.cc b/chrome/browser/ui/gtk/options/cookie_filter_page_gtk.cc index 42d3f10..39c0605 100644 --- a/chrome/browser/ui/gtk/options/cookie_filter_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/cookie_filter_page_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/gtk/options/cookie_filter_page_gtk.h" -#include "app/l10n_util.h" #include "base/auto_reset.h" #include "base/command_line.h" #include "chrome/browser/browsing_data_local_storage_helper.h" @@ -19,6 +18,7 @@ #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/cookies_view.cc b/chrome/browser/ui/gtk/options/cookies_view.cc index b30c960..01610fe 100644 --- a/chrome/browser/ui/gtk/options/cookies_view.cc +++ b/chrome/browser/ui/gtk/options/cookies_view.cc @@ -8,7 +8,6 @@ #include <set> #include <string> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/cookies_tree_model.h" @@ -17,6 +16,7 @@ #include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/fonts_languages_window_gtk.cc b/chrome/browser/ui/gtk/options/fonts_languages_window_gtk.cc index 9de3dc1..909b31c 100644 --- a/chrome/browser/ui/gtk/options/fonts_languages_window_gtk.cc +++ b/chrome/browser/ui/gtk/options/fonts_languages_window_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/gtk/gtk_util.h" @@ -14,6 +13,7 @@ #include "chrome/browser/ui/gtk/options/languages_page_gtk.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" /////////////////////////////////////////////////////////////////////////////// // FontsLanguagesWindowGtk diff --git a/chrome/browser/ui/gtk/options/fonts_page_gtk.cc b/chrome/browser/ui/gtk/options/fonts_page_gtk.cc index 0c4a133..cdafd31 100644 --- a/chrome/browser/ui/gtk/options/fonts_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/fonts_page_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "chrome/browser/default_encoding_combo_model.h" @@ -16,6 +15,7 @@ #include "chrome/common/pref_names.h" #include "gfx/font.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/general_page_gtk.cc b/chrome/browser/ui/gtk/options/general_page_gtk.cc index aa6ae80..a398850 100644 --- a/chrome/browser/ui/gtk/options/general_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/general_page_gtk.cc @@ -7,7 +7,6 @@ #include <set> #include <vector> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" @@ -33,6 +32,7 @@ #include "gfx/gtk_util.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/gtk/options/languages_page_gtk.cc b/chrome/browser/ui/gtk/options/languages_page_gtk.cc index a2230d4..3189bb2 100644 --- a/chrome/browser/ui/gtk/options/languages_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/languages_page_gtk.cc @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" @@ -22,6 +21,7 @@ #include "chrome/common/spellcheck_common.h" #include "grit/generated_resources.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.cc b/chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.cc index fefb55b..53d8a61 100644 --- a/chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.cc +++ b/chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/gtk/options/managed_prefs_banner_gtk.h" -#include "app/l10n_util.h" #include "chrome/browser/ui/gtk/gtk_theme_provider.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/options_window_gtk.cc b/chrome/browser/ui/gtk/options/options_window_gtk.cc index 517f953..ecc8ab3 100644 --- a/chrome/browser/ui/gtk/options/options_window_gtk.cc +++ b/chrome/browser/ui/gtk/options/options_window_gtk.cc @@ -4,7 +4,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/scoped_ptr.h" #include "chrome/browser/accessibility_events.h" @@ -24,6 +23,7 @@ #include "chrome/common/pref_names.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/options/internet_page_view.h" diff --git a/chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.cc b/chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.cc index 77b6226..013661e 100644 --- a/chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/passwords_exceptions_page_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/prefs/pref_service.h" @@ -20,6 +19,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/passwords_exceptions_window_gtk.cc b/chrome/browser/ui/gtk/options/passwords_exceptions_window_gtk.cc index e81865c..f06b48d 100644 --- a/chrome/browser/ui/gtk/options/passwords_exceptions_window_gtk.cc +++ b/chrome/browser/ui/gtk/options/passwords_exceptions_window_gtk.cc @@ -8,7 +8,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/gtk/accessible_widget_helper_gtk.h" @@ -19,6 +18,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" /////////////////////////////////////////////////////////////////////////////// // PasswordsExceptionsWindowGtk diff --git a/chrome/browser/ui/gtk/options/passwords_page_gtk.cc b/chrome/browser/ui/gtk/options/passwords_page_gtk.cc index c18080e..2cc353c 100644 --- a/chrome/browser/ui/gtk/options/passwords_page_gtk.cc +++ b/chrome/browser/ui/gtk/options/passwords_page_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/prefs/pref_service.h" @@ -22,6 +21,7 @@ #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/simple_content_exceptions_window.cc b/chrome/browser/ui/gtk/options/simple_content_exceptions_window.cc index 63a38da..d824b93 100644 --- a/chrome/browser/ui/gtk/options/simple_content_exceptions_window.cc +++ b/chrome/browser/ui/gtk/options/simple_content_exceptions_window.cc @@ -4,13 +4,13 @@ #include "chrome/browser/ui/gtk/options/simple_content_exceptions_window.h" -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "gfx/gtk_util.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.cc b/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.cc index f9a47db..78102ea6 100644 --- a/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.cc +++ b/chrome/browser/ui/gtk/options/url_picker_dialog_gtk.cc @@ -4,7 +4,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/net/url_fixer_upper.h" @@ -23,6 +22,7 @@ #include "grit/locale_settings.h" #include "net/base/net_util.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc index b73823c..b3324ae 100644 --- a/chrome/browser/ui/gtk/page_info_bubble_gtk.cc +++ b/chrome/browser/ui/gtk/page_info_bubble_gtk.cc @@ -6,7 +6,6 @@ #include "build/build_config.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -28,6 +27,7 @@ #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" class Profile; diff --git a/chrome/browser/ui/gtk/process_singleton_dialog.cc b/chrome/browser/ui/gtk/process_singleton_dialog.cc index ac1b97e..78d91cf 100644 --- a/chrome/browser/ui/gtk/process_singleton_dialog.cc +++ b/chrome/browser/ui/gtk/process_singleton_dialog.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/gtk/process_singleton_dialog.h" -#include "app/l10n_util.h" #include "base/message_loop.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/chromium_strings.h" +#include "ui/base/l10n/l10n_util.h" // static void ProcessSingletonDialog::ShowAndRun(const std::string& message) { diff --git a/chrome/browser/ui/gtk/reload_button_gtk.cc b/chrome/browser/ui/gtk/reload_button_gtk.cc index 36972b5..4bed9fa 100644 --- a/chrome/browser/ui/gtk/reload_button_gtk.cc +++ b/chrome/browser/ui/gtk/reload_button_gtk.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/logging.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser.h" @@ -17,6 +16,7 @@ #include "chrome/common/notification_source.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" // The width of this button in GTK+ theme mode. The Stop and Refresh stock icons // can be different sizes; this variable is used to make sure that the button diff --git a/chrome/browser/ui/gtk/repost_form_warning_gtk.cc b/chrome/browser/ui/gtk/repost_form_warning_gtk.cc index 1416160..68aa14e 100644 --- a/chrome/browser/ui/gtk/repost_form_warning_gtk.cc +++ b/chrome/browser/ui/gtk/repost_form_warning_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/gtk/repost_form_warning_gtk.h" -#include "app/l10n_util.h" #include "base/message_loop.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/repost_form_warning_controller.h" @@ -13,6 +12,7 @@ #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/common/notification_type.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" RepostFormWarningGtk::RepostFormWarningGtk(GtkWindow* parent, TabContents* tab_contents) diff --git a/chrome/browser/ui/gtk/sad_tab_gtk.cc b/chrome/browser/ui/gtk/sad_tab_gtk.cc index 25dba4b..ba0eec7 100644 --- a/chrome/browser/ui/gtk/sad_tab_gtk.cc +++ b/chrome/browser/ui/gtk/sad_tab_gtk.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/ui/gtk/gtk_chrome_link_button.h" @@ -15,6 +14,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 { diff --git a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc index afae5e3..f5cefc0 100644 --- a/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc +++ b/chrome/browser/ui/gtk/ssl_client_certificate_selector.cc @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/logging.h" #include "base/nss_util.h" @@ -26,6 +25,7 @@ #include "grit/generated_resources.h" #include "net/base/x509_certificate.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc index fc21e6e..1336972 100644 --- a/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/ui/gtk/tabs/tab_renderer_gtk.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <utility> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" #include "chrome/browser/profiles/profile.h" @@ -27,6 +26,7 @@ #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/animation/throb_animation.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/browser/ui/gtk/task_manager_gtk.cc b/chrome/browser/ui/gtk/task_manager_gtk.cc index 83b7a57..7d3e54c 100644 --- a/chrome/browser/ui/gtk/task_manager_gtk.cc +++ b/chrome/browser/ui/gtk/task_manager_gtk.cc @@ -11,7 +11,6 @@ #include <utility> #include <vector> -#include "app/l10n_util.h" #include "base/auto_reset.h" #include "base/command_line.h" #include "base/logging.h" @@ -30,6 +29,7 @@ #include "grit/app_resources.h" #include "grit/chromium_strings.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/simple_menu_model.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/gtk/theme_install_bubble_view_gtk.cc b/chrome/browser/ui/gtk/theme_install_bubble_view_gtk.cc index 562744f..016f3e3 100644 --- a/chrome/browser/ui/gtk/theme_install_bubble_view_gtk.cc +++ b/chrome/browser/ui/gtk/theme_install_bubble_view_gtk.cc @@ -6,12 +6,12 @@ #include <math.h> -#include "app/l10n_util.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "chrome/browser/ui/gtk/rounded_window.h" #include "chrome/common/notification_service.h" #include "chrome/common/notification_type.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" // Roundedness of bubble. static const int kBubbleCornerRadius = 4; diff --git a/chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.cc b/chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.cc index 609249b..4b6f489 100644 --- a/chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ui/gtk/translate/after_translate_infobar_gtk.h" -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" AfterTranslateInfoBar::AfterTranslateInfoBar( TranslateInfoBarDelegate* delegate) diff --git a/chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.cc b/chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.cc index 7f727fc..20a14c7 100644 --- a/chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.cc +++ b/chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.cc @@ -4,11 +4,11 @@ #include "chrome/browser/ui/gtk/translate/before_translate_infobar_gtk.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/gtk/gtk_util.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" BeforeTranslateInfoBar::BeforeTranslateInfoBar( TranslateInfoBarDelegate* delegate) diff --git a/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.cc b/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.cc index bfca4d4..ad98bdd 100644 --- a/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.cc +++ b/chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/gtk/translate/translate_infobar_base_gtk.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/translate/options_menu_model.h" #include "chrome/browser/translate/translate_infobar_delegate.h" @@ -16,6 +15,7 @@ #include "gfx/canvas.h" #include "grit/generated_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/browser/ui/gtk/update_recommended_dialog.cc b/chrome/browser/ui/gtk/update_recommended_dialog.cc index ba6706b..29e7991 100644 --- a/chrome/browser/ui/gtk/update_recommended_dialog.cc +++ b/chrome/browser/ui/gtk/update_recommended_dialog.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/prefs/pref_service.h" @@ -14,6 +13,7 @@ #include "chrome/common/pref_names.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" static const int kMessageWidth = 400; diff --git a/chrome/browser/ui/login/login_prompt.cc b/chrome/browser/ui/login/login_prompt.cc index 5269a0c..8eb1008 100644 --- a/chrome/browser/ui/login/login_prompt.cc +++ b/chrome/browser/ui/login/login_prompt.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/synchronization/lock.h" #include "base/utf_string_conversions.h" @@ -24,6 +23,7 @@ #include "net/base/auth.h" #include "net/base/net_util.h" #include "net/url_request/url_request.h" +#include "ui/base/l10n/l10n_util.h" using webkit_glue::PasswordForm; diff --git a/chrome/browser/ui/login/login_prompt_gtk.cc b/chrome/browser/ui/login/login_prompt_gtk.cc index 5516316..f070b65a 100644 --- a/chrome/browser/ui/login/login_prompt_gtk.cc +++ b/chrome/browser/ui/login/login_prompt_gtk.cc @@ -6,7 +6,6 @@ #include <gtk/gtk.h> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/password_manager/password_manager.h" @@ -22,6 +21,7 @@ #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "ui/base/gtk/gtk_signal.h" +#include "ui/base/l10n/l10n_util.h" using webkit_glue::PasswordForm; diff --git a/chrome/browser/ui/login/login_prompt_mac.mm b/chrome/browser/ui/login/login_prompt_mac.mm index 0547e39..f663632 100644 --- a/chrome/browser/ui/login/login_prompt_mac.mm +++ b/chrome/browser/ui/login/login_prompt_mac.mm @@ -5,7 +5,6 @@ #include "chrome/browser/ui/login/login_prompt.h" #import "chrome/browser/ui/login/login_prompt_mac.h" -#include "app/l10n_util.h" #include "base/mac/mac_util.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" @@ -21,6 +20,7 @@ #include "grit/generated_resources.h" #include "net/url_request/url_request.h" #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h" +#include "ui/base/l10n/l10n_util.h" using webkit_glue::PasswordForm; diff --git a/chrome/browser/ui/login/login_prompt_win.cc b/chrome/browser/ui/login/login_prompt_win.cc index 58a93bc..cf111d1 100644 --- a/chrome/browser/ui/login/login_prompt_win.cc +++ b/chrome/browser/ui/login/login_prompt_win.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/login/login_prompt.h" -#include "app/l10n_util.h" #include "chrome/browser/browser_thread.h" #include "chrome/browser/password_manager/password_manager.h" #include "chrome/browser/renderer_host/render_process_host.h" @@ -17,6 +16,7 @@ #include "chrome/browser/ui/views/login_view.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" +#include "ui/base/l10n/l10n_util.h" #include "views/window/dialog_delegate.h" using webkit_glue::PasswordForm; diff --git a/chrome/browser/ui/omnibox/location_bar_util.cc b/chrome/browser/ui/omnibox/location_bar_util.cc index efb9a3c..83407bc 100644 --- a/chrome/browser/ui/omnibox/location_bar_util.cc +++ b/chrome/browser/ui/omnibox/location_bar_util.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ui/omnibox/location_bar_util.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" +#include "ui/base/l10n/l10n_util.h" namespace location_bar_util { diff --git a/chrome/browser/ui/toolbar/back_forward_menu_model.cc b/chrome/browser/ui/toolbar/back_forward_menu_model.cc index 06e0841..67943d9 100644 --- a/chrome/browser/ui/toolbar/back_forward_menu_model.cc +++ b/chrome/browser/ui/toolbar/back_forward_menu_model.cc @@ -6,7 +6,6 @@ #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" -#include "app/l10n_util.h" #include "base/string_number_conversions.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/tab_contents/navigation_controller.h" @@ -20,6 +19,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "net/base/registry_controlled_domain.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" diff --git a/chrome/browser/ui/toolbar/encoding_menu_controller.cc b/chrome/browser/ui/toolbar/encoding_menu_controller.cc index 177aa28..d28a437 100644 --- a/chrome/browser/ui/toolbar/encoding_menu_controller.cc +++ b/chrome/browser/ui/toolbar/encoding_menu_controller.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/toolbar/encoding_menu_controller.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -14,6 +13,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" const int EncodingMenuController::kValidEncodingIds[] = { IDC_ENCODING_UTF8, diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc index 1783c50..1c45e4d 100644 --- a/chrome/browser/ui/toolbar/wrench_menu_model.cc +++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc @@ -7,7 +7,6 @@ #include <algorithm> #include <cmath> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/i18n/number_formatting.h" #include "base/string_number_conversions.h" @@ -34,6 +33,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/models/button_menu_item_model.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/ui/views/about_chrome_view.cc b/chrome/browser/ui/views/about_chrome_view.cc index c002142..5bb5c6d 100644 --- a/chrome/browser/ui/views/about_chrome_view.cc +++ b/chrome/browser/ui/views/about_chrome_view.cc @@ -12,7 +12,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/i18n/rtl.h" #include "base/string_number_conversions.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/textfield/textfield.h" #include "views/controls/throbber.h" diff --git a/chrome/browser/ui/views/accessible_view_helper.cc b/chrome/browser/ui/views/accessible_view_helper.cc index b2c17ad..e365b6c 100644 --- a/chrome/browser/ui/views/accessible_view_helper.cc +++ b/chrome/browser/ui/views/accessible_view_helper.cc @@ -4,11 +4,11 @@ #include "chrome/browser/ui/views/accessible_view_helper.h" -#include "app/l10n_util.h" #include "chrome/browser/accessibility_events.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/accessibility_event_router_views.h" #include "chrome/common/notification_service.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/native/native_view_host.h" #include "views/widget/widget.h" #include "views/view.h" diff --git a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc index f7f15f1..1900df2 100644 --- a/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/autocomplete/autocomplete_popup_contents_view.h" -#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "base/i18n/bidi_line_iterator.h" #include "base/i18n/rtl.h" @@ -25,6 +24,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "ui/base/theme_provider.h" diff --git a/chrome/browser/ui/views/autofill_profiles_view_win.cc b/chrome/browser/ui/views/autofill_profiles_view_win.cc index 8018a6b..8ca0d9d 100644 --- a/chrome/browser/ui/views/autofill_profiles_view_win.cc +++ b/chrome/browser/ui/views/autofill_profiles_view_win.cc @@ -7,7 +7,6 @@ #include <vsstyle.h> #include <vssym32.h> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/string16.h" #include "base/string_number_conversions.h" @@ -33,6 +32,7 @@ #include "grit/theme_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/border.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/ui/views/bookmark_bar_instructions_view.cc b/chrome/browser/ui/views/bookmark_bar_instructions_view.cc index 83b783a..4f5b27f 100644 --- a/chrome/browser/ui/views/bookmark_bar_instructions_view.cc +++ b/chrome/browser/ui/views/bookmark_bar_instructions_view.cc @@ -4,11 +4,11 @@ #include "chrome/browser/ui/views/bookmark_bar_instructions_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/defaults.h" #include "chrome/browser/themes/browser_theme_provider.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/label.h" using views::View; diff --git a/chrome/browser/ui/views/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmark_bar_view.cc index 19ecaa6..456f92d 100644 --- a/chrome/browser/ui/views/bookmark_bar_view.cc +++ b/chrome/browser/ui/views/bookmark_bar_view.cc @@ -9,7 +9,6 @@ #include <set> #include <vector> -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -41,6 +40,7 @@ #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.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/text/text_elider.h" #include "views/controls/button/menu_button.h" diff --git a/chrome/browser/ui/views/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmark_bubble_view.cc index 4d582b3..1cd1797 100644 --- a/chrome/browser/ui/views/bookmark_bubble_view.cc +++ b/chrome/browser/ui/views/bookmark_bubble_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/bookmark_bubble_view.h" -#include "app/l10n_util.h" #include "base/string16.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -21,6 +20,7 @@ #include "grit/generated_resources.h" #include "grit/theme_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/event.h" #include "views/standard_layout.h" diff --git a/chrome/browser/ui/views/bookmark_context_menu.cc b/chrome/browser/ui/views/bookmark_context_menu.cc index 67e6ded..44a8618 100644 --- a/chrome/browser/ui/views/bookmark_context_menu.cc +++ b/chrome/browser/ui/views/bookmark_context_menu.cc @@ -4,13 +4,13 @@ #include "chrome/browser/ui/views/bookmark_context_menu.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/profiles/profile.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/menu/menu_item_view.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/ui/views/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmark_editor_view.cc index dd925f7..ab8bdbf 100644 --- a/chrome/browser/ui/views/bookmark_editor_view.cc +++ b/chrome/browser/ui/views/bookmark_editor_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/bookmark_editor_view.h" -#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/logging.h" #include "base/string_util.h" @@ -21,6 +20,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/net_util.h" +#include "ui/base/l10n/l10n_util.h" #include "views/background.h" #include "views/focus/focus_manager.h" #include "views/grid_layout.h" diff --git a/chrome/browser/ui/views/browser_actions_container.cc b/chrome/browser/ui/views/browser_actions_container.cc index e90d5bd..a213e07 100644 --- a/chrome/browser/ui/views/browser_actions_container.cc +++ b/chrome/browser/ui/views/browser_actions_container.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/browser_actions_container.h" -#include "app/l10n_util.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -37,6 +36,7 @@ #include "third_party/skia/include/core/SkTypeface.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/button/menu_button.h" #include "views/controls/button/text_button.h" diff --git a/chrome/browser/ui/views/clear_browsing_data.cc b/chrome/browser/ui/views/clear_browsing_data.cc index 2ba602c..f6b200f 100644 --- a/chrome/browser/ui/views/clear_browsing_data.cc +++ b/chrome/browser/ui/views/clear_browsing_data.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/clear_browsing_data.h" -#include "app/l10n_util.h" #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_window.h" @@ -20,6 +19,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/url_request/url_request_context.h" +#include "ui/base/l10n/l10n_util.h" #include "views/background.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/clear_browsing_data_view.cc b/chrome/browser/ui/views/clear_browsing_data_view.cc index 344880d..6d84416 100644 --- a/chrome/browser/ui/views/clear_browsing_data_view.cc +++ b/chrome/browser/ui/views/clear_browsing_data_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/clear_browsing_data_view.h" -#include "app/l10n_util.h" #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_window.h" @@ -17,6 +16,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/url_request/url_request_context.h" +#include "ui/base/l10n/l10n_util.h" #include "views/background.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/clear_data_view.cc b/chrome/browser/ui/views/clear_data_view.cc index c622fe5..7080a02 100644 --- a/chrome/browser/ui/views/clear_data_view.cc +++ b/chrome/browser/ui/views/clear_data_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/clear_data_view.h" -#include "app/l10n_util.h" #include "base/string16.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_window.h" @@ -16,6 +15,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/url_request/url_request_context.h" +#include "ui/base/l10n/l10n_util.h" #include "views/background.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/clear_server_data.cc b/chrome/browser/ui/views/clear_server_data.cc index ea457c9..3916500 100644 --- a/chrome/browser/ui/views/clear_server_data.cc +++ b/chrome/browser/ui/views/clear_server_data.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/clear_server_data.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/string16.h" #include "base/utf_string_conversions.h" @@ -18,6 +17,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/url_request/url_request_context.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/checkbox.h" diff --git a/chrome/browser/ui/views/collected_cookies_win.cc b/chrome/browser/ui/views/collected_cookies_win.cc index 4119014..975a829 100644 --- a/chrome/browser/ui/views/collected_cookies_win.cc +++ b/chrome/browser/ui/views/collected_cookies_win.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/collected_cookies_win.h" -#include "app/l10n_util.h" #include "chrome/browser/cookies_tree_model.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/tab_contents/tab_contents.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/box_layout.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/confirm_message_box_dialog.cc b/chrome/browser/ui/views/confirm_message_box_dialog.cc index 2c076c2..87b11e8 100644 --- a/chrome/browser/ui/views/confirm_message_box_dialog.cc +++ b/chrome/browser/ui/views/confirm_message_box_dialog.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/views/confirm_message_box_dialog.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" #include "views/standard_layout.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/content_setting_bubble_contents.cc b/chrome/browser/ui/views/content_setting_bubble_contents.cc index 4adf83c..ed6cf46f 100644 --- a/chrome/browser/ui/views/content_setting_bubble_contents.cc +++ b/chrome/browser/ui/views/content_setting_bubble_contents.cc @@ -8,7 +8,6 @@ #include <gdk/gdk.h> #endif -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/blocked_content_container.h" #include "chrome/browser/content_settings/host_content_settings_map.h" @@ -21,6 +20,7 @@ #include "chrome/common/notification_source.h" #include "chrome/common/notification_type.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/button/native_button.h" #include "views/controls/button/radio_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/cookie_info_view.cc b/chrome/browser/ui/views/cookie_info_view.cc index 46e87ce..1fd65c1 100644 --- a/chrome/browser/ui/views/cookie_info_view.cc +++ b/chrome/browser/ui/views/cookie_info_view.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/message_loop.h" #include "base/string16.h" @@ -17,6 +16,7 @@ #include "gfx/color_utils.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "views/border.h" #include "views/grid_layout.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/create_application_shortcut_view.cc b/chrome/browser/ui/views/create_application_shortcut_view.cc index 74c2722..e833e00 100644 --- a/chrome/browser/ui/views/create_application_shortcut_view.cc +++ b/chrome/browser/ui/views/create_application_shortcut_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/create_application_shortcut_view.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/utf_string_conversions.h" #include "base/win/windows_version.h" @@ -24,6 +23,7 @@ #include "net/url_request/url_request.h" #include "third_party/skia/include/core/SkRect.h" #include "third_party/skia/include/core/SkPaint.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/button/checkbox.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/database_info_view.cc b/chrome/browser/ui/views/database_info_view.cc index 6b6b802..f47a97d 100644 --- a/chrome/browser/ui/views/database_info_view.cc +++ b/chrome/browser/ui/views/database_info_view.cc @@ -6,11 +6,11 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/utf_string_conversions.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/grid_layout.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/default_search_view.cc b/chrome/browser/ui/views/default_search_view.cc index eb4af7b..ec44f22 100644 --- a/chrome/browser/ui/views/default_search_view.cc +++ b/chrome/browser/ui/views/default_search_view.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search_engines/template_url.h" @@ -18,6 +17,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/message_box_flags.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/image_view.h" diff --git a/chrome/browser/ui/views/download_item_view.cc b/chrome/browser/ui/views/download_item_view.cc index 6a97104..1b8875f 100644 --- a/chrome/browser/ui/views/download_item_view.cc +++ b/chrome/browser/ui/views/download_item_view.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/file_path.h" #include "base/i18n/rtl.h" @@ -24,6 +23,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/text/text_elider.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/download_shelf_view.cc b/chrome/browser/ui/views/download_shelf_view.cc index de3a845..2607961 100644 --- a/chrome/browser/ui/views/download_shelf_view.cc +++ b/chrome/browser/ui/views/download_shelf_view.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/download/download_item.h" @@ -22,6 +21,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/ui/views/edit_search_engine_dialog.cc b/chrome/browser/ui/views/edit_search_engine_dialog.cc index 2850691..7af0c0c 100644 --- a/chrome/browser/ui/views/edit_search_engine_dialog.cc +++ b/chrome/browser/ui/views/edit_search_engine_dialog.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/edit_search_engine_dialog.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -14,6 +13,7 @@ #include "grit/app_resources.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/image_view.h" diff --git a/chrome/browser/ui/views/extensions/extension_install_prompt.cc b/chrome/browser/ui/views/extensions/extension_install_prompt.cc index 8128737..bb91bb7 100644 --- a/chrome/browser/ui/views/extensions/extension_install_prompt.cc +++ b/chrome/browser/ui/views/extensions/extension_install_prompt.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/file_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -12,6 +11,7 @@ #include "chrome/browser/ui/views/window.h" #include "chrome/common/extensions/extension.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/button/checkbox.h" #include "views/controls/image_view.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/extensions/extension_install_prompt2.cc b/chrome/browser/ui/views/extensions/extension_install_prompt2.cc index c0edc52..7360f0a 100644 --- a/chrome/browser/ui/views/extensions/extension_install_prompt2.cc +++ b/chrome/browser/ui/views/extensions/extension_install_prompt2.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/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -11,6 +10,7 @@ #include "chrome/browser/ui/views/window.h" #include "chrome/common/extensions/extension.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/standard_layout.h" diff --git a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc index 2ebf514..b9c6b24 100644 --- a/chrome/browser/ui/views/extensions/extension_installed_bubble.cc +++ b/chrome/browser/ui/views/extensions/extension_installed_bubble.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/message_loop.h" #include "base/utf_string_conversions.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/resource/resource_bundle.h" #include "views/controls/button/image_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/external_protocol_dialog.cc b/chrome/browser/ui/views/external_protocol_dialog.cc index c4d107a..434d82e 100644 --- a/chrome/browser/ui/views/external_protocol_dialog.cc +++ b/chrome/browser/ui/views/external_protocol_dialog.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/external_protocol_dialog.h" -#include "app/l10n_util.h" #include "base/metrics/histogram.h" #include "base/string_util.h" #include "base/threading/thread.h" @@ -16,6 +15,7 @@ #include "chrome/browser/tab_contents/tab_util.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/ui/views/find_bar_view.cc b/chrome/browser/ui/views/find_bar_view.cc index b189cbd..9738c01 100644 --- a/chrome/browser/ui/views/find_bar_view.cc +++ b/chrome/browser/ui/views/find_bar_view.cc @@ -6,7 +6,6 @@ #include <algorithm> -#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 "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc index b1b2d84..6d72597 100644 --- a/chrome/browser/ui/views/first_run_bubble.cc +++ b/chrome/browser/ui/views/first_run_bubble.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/first_run_bubble.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" @@ -17,6 +16,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "ui/base/l10n/l10n_font_util.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" #include "views/event.h" diff --git a/chrome/browser/ui/views/first_run_search_engine_view.cc b/chrome/browser/ui/views/first_run_search_engine_view.cc index 63b7e2a..cc417ca 100644 --- a/chrome/browser/ui/views/first_run_search_engine_view.cc +++ b/chrome/browser/ui/views/first_run_search_engine_view.cc @@ -8,7 +8,6 @@ #include <map> #include <vector> -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/rand_util.h" #include "base/time.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 "views/controls/button/button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc index 9c0707a..21e69b8 100644 --- a/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/frame/app_panel_browser_frame_view.h" -#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -17,6 +16,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/button/image_button.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/frame/browser_root_view.cc b/chrome/browser/ui/views/frame/browser_root_view.cc index 720ca3b..0350f19 100644 --- a/chrome/browser/ui/views/frame/browser_root_view.cc +++ b/chrome/browser/ui/views/frame/browser_root_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/frame/browser_root_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete.h" #include "chrome/browser/autocomplete/autocomplete_classifier.h" @@ -17,6 +16,7 @@ #include "grit/chromium_strings.h" #include "ui/base/dragdrop/drag_drop_types.h" #include "ui/base/dragdrop/os_exchange_data.h" +#include "ui/base/l10n/l10n_util.h" BrowserRootView::BrowserRootView(BrowserView* browser_view, views::Widget* widget) diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc index 1637c7a..69477b8 100644 --- a/chrome/browser/ui/views/frame/browser_view.cc +++ b/chrome/browser/ui/views/frame/browser_view.cc @@ -8,7 +8,6 @@ #include <gtk/gtk.h> #endif -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/i18n/rtl.h" #include "base/string_number_conversions.h" @@ -73,6 +72,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "grit/webkit_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/single_split_view.h" #include "views/focus/external_focus_tracker.h" diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc index 60e960ab..2f96147 100644 --- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h" -#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -20,6 +19,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 "ui/base/theme_provider.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/ui/views/fullscreen_exit_bubble.cc b/chrome/browser/ui/views/fullscreen_exit_bubble.cc index 485669c..fa92616 100644 --- a/chrome/browser/ui/views/fullscreen_exit_bubble.cc +++ b/chrome/browser/ui/views/fullscreen_exit_bubble.cc @@ -4,20 +4,20 @@ #include "chrome/browser/ui/views/fullscreen_exit_bubble.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "gfx/canvas_skia.h" #include "grit/generated_resources.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/screen.h" #include "views/widget/root_view.h" #include "views/window/window.h" #if defined(OS_WIN) -#include "app/l10n_util_win.h" +#include "ui/base/l10n/l10n_util_win.h" #include "views/widget/widget_win.h" #elif defined(OS_LINUX) #include "views/widget/widget_gtk.h" diff --git a/chrome/browser/ui/views/generic_info_view.cc b/chrome/browser/ui/views/generic_info_view.cc index c748404..396c5b2 100644 --- a/chrome/browser/ui/views/generic_info_view.cc +++ b/chrome/browser/ui/views/generic_info_view.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/views/generic_info_view.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "gfx/color_utils.h" +#include "ui/base/l10n/l10n_util.h" #include "views/grid_layout.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/generic_info_view_unittest.cc b/chrome/browser/ui/views/generic_info_view_unittest.cc index 5dd9e78..8f7cceb 100644 --- a/chrome/browser/ui/views/generic_info_view_unittest.cc +++ b/chrome/browser/ui/views/generic_info_view_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 "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/views/generic_info_view.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" #include "views/widget/root_view.h" diff --git a/chrome/browser/ui/views/hung_renderer_view.cc b/chrome/browser/ui/views/hung_renderer_view.cc index 0c16c9a..99610bb 100644 --- a/chrome/browser/ui/views/hung_renderer_view.cc +++ b/chrome/browser/ui/views/hung_renderer_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/hung_renderer_dialog.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -18,6 +17,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/grid_layout.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/importer_lock_view.cc b/chrome/browser/ui/views/importer_lock_view.cc index 95d9c31..5dd1d3c 100644 --- a/chrome/browser/ui/views/importer_lock_view.cc +++ b/chrome/browser/ui/views/importer_lock_view.cc @@ -4,13 +4,13 @@ #include "chrome/browser/ui/views/importer_lock_view.h" -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/importer/importer.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/controls/label.h" #include "views/standard_layout.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/importer_view.cc b/chrome/browser/ui/views/importer_view.cc index 95583c2..bef4a13 100644 --- a/chrome/browser/ui/views/importer_view.cc +++ b/chrome/browser/ui/views/importer_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/importer_view.h" -#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -12,6 +11,7 @@ #include "chrome/browser/importer/importer_data_types.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" #include "views/grid_layout.h" diff --git a/chrome/browser/ui/views/importing_progress_view.cc b/chrome/browser/ui/views/importing_progress_view.cc index 657f5c0..29af998 100644 --- a/chrome/browser/ui/views/importing_progress_view.cc +++ b/chrome/browser/ui/views/importing_progress_view.cc @@ -4,11 +4,11 @@ #include "chrome/browser/ui/views/importing_progress_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.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/controls/label.h" #include "views/controls/throbber.h" diff --git a/chrome/browser/ui/views/indexed_db_info_view.cc b/chrome/browser/ui/views/indexed_db_info_view.cc index 729baa2..00cd281 100644 --- a/chrome/browser/ui/views/indexed_db_info_view.cc +++ b/chrome/browser/ui/views/indexed_db_info_view.cc @@ -6,11 +6,11 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/utf_string_conversions.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/grid_layout.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/infobars/after_translate_infobar.cc b/chrome/browser/ui/views/infobars/after_translate_infobar.cc index 69f04f8..c7f111c 100644 --- a/chrome/browser/ui/views/infobars/after_translate_infobar.cc +++ b/chrome/browser/ui/views/infobars/after_translate_infobar.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/infobars/after_translate_infobar.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/translate/options_menu_model.h" #include "chrome/browser/translate/translate_infobar_delegate.h" @@ -12,6 +11,7 @@ #include "chrome/browser/ui/views/infobars/infobar_text_button.h" #include "grit/app_resources.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/button/menu_button.h" #include "views/controls/button/text_button.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/infobars/before_translate_infobar.cc b/chrome/browser/ui/views/infobars/before_translate_infobar.cc index c8dc84c..0feea6f 100644 --- a/chrome/browser/ui/views/infobars/before_translate_infobar.cc +++ b/chrome/browser/ui/views/infobars/before_translate_infobar.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ui/views/infobars/before_translate_infobar.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/translate/options_menu_model.h" #include "chrome/browser/translate/translate_infobar_delegate.h" #include "chrome/browser/ui/views/infobars/infobar_text_button.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/button/menu_button.h" #include "views/controls/image_view.h" #include "views/controls/menu/menu_2.h" diff --git a/chrome/browser/ui/views/infobars/infobar_container.cc b/chrome/browser/ui/views/infobars/infobar_container.cc index 270e43f..e4f1445 100644 --- a/chrome/browser/ui/views/infobars/infobar_container.cc +++ b/chrome/browser/ui/views/infobars/infobar_container.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/infobars/infobar_container.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/infobar_delegate.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -13,6 +12,7 @@ #include "chrome/common/notification_details.h" #include "chrome/common/notification_source.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" // InfoBarContainer, public: --------------------------------------------------- diff --git a/chrome/browser/ui/views/infobars/infobar_text_button.cc b/chrome/browser/ui/views/infobars/infobar_text_button.cc index 9c956c4..5adabc7 100644 --- a/chrome/browser/ui/views/infobars/infobar_text_button.cc +++ b/chrome/browser/ui/views/infobars/infobar_text_button.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ui/views/infobars/infobar_text_button.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/views/infobars/infobar_button_border.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" // static diff --git a/chrome/browser/ui/views/infobars/infobars.cc b/chrome/browser/ui/views/infobars/infobars.cc index d83d76e..1014ed8 100644 --- a/chrome/browser/ui/views/infobars/infobars.cc +++ b/chrome/browser/ui/views/infobars/infobars.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/infobars/infobars.h" -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/views/event_utils.h" @@ -14,6 +13,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/ui/views/instant_confirm_view.cc b/chrome/browser/ui/views/instant_confirm_view.cc index 164ae41..adb96cd 100644 --- a/chrome/browser/ui/views/instant_confirm_view.cc +++ b/chrome/browser/ui/views/instant_confirm_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/instant_confirm_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/instant/instant_confirm_dialog.h" @@ -14,6 +13,7 @@ #include "grit/generated_resources.h" #include "grit/chromium_strings.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/label.h" #include "views/grid_layout.h" #include "views/layout_manager.h" diff --git a/chrome/browser/ui/views/js_modal_dialog_views.cc b/chrome/browser/ui/views/js_modal_dialog_views.cc index e3a05fc..6657ade 100644 --- a/chrome/browser/ui/views/js_modal_dialog_views.cc +++ b/chrome/browser/ui/views/js_modal_dialog_views.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ui/views/js_modal_dialog_views.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog.h" #include "chrome/browser/ui/views/window.h" #include "grit/generated_resources.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" #include "views/controls/message_box_view.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/keyboard_overlay_delegate.cc b/chrome/browser/ui/views/keyboard_overlay_delegate.cc index 6081316..299961c 100644 --- a/chrome/browser/ui/views/keyboard_overlay_delegate.cc +++ b/chrome/browser/ui/views/keyboard_overlay_delegate.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/keyboard_overlay_delegate.h" -#include "app/l10n_util.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -12,7 +11,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" - +#include "ui/base/l10n/l10n_util.h" void KeyboardOverlayDelegate::ShowDialog(gfx::NativeWindow owning_window) { Browser* browser = BrowserList::GetLastActive(); diff --git a/chrome/browser/ui/views/keyword_editor_view.cc b/chrome/browser/ui/views/keyword_editor_view.cc index 5eb1665..e1f961e 100644 --- a/chrome/browser/ui/views/keyword_editor_view.cc +++ b/chrome/browser/ui/views/keyword_editor_view.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -23,6 +22,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/background.h" #include "views/grid_layout.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/local_storage_info_view.cc b/chrome/browser/ui/views/local_storage_info_view.cc index e2cee49..9cc29f3 100644 --- a/chrome/browser/ui/views/local_storage_info_view.cc +++ b/chrome/browser/ui/views/local_storage_info_view.cc @@ -6,11 +6,11 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/i18n/time_formatting.h" #include "base/utf_string_conversions.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/grid_layout.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/local_storage_set_item_info_view.cc b/chrome/browser/ui/views/local_storage_set_item_info_view.cc index f4752d4..da1df11 100644 --- a/chrome/browser/ui/views/local_storage_set_item_info_view.cc +++ b/chrome/browser/ui/views/local_storage_set_item_info_view.cc @@ -6,10 +6,10 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "gfx/color_utils.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/grid_layout.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc index a946a3a1..6c0f5f3 100644 --- a/chrome/browser/ui/views/location_bar/content_setting_image_view.cc +++ b/chrome/browser/ui/views/location_bar/content_setting_image_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/location_bar/content_setting_image_view.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_setting_bubble_model.h" @@ -18,6 +17,7 @@ #include "gfx/canvas_skia.h" #include "gfx/skia_util.h" #include "third_party/skia/include/core/SkShader.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/border.h" diff --git a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc index 8f6c290..7e4ba37 100644 --- a/chrome/browser/ui/views/location_bar/keyword_hint_view.cc +++ b/chrome/browser/ui/views/location_bar/keyword_hint_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -14,6 +13,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc index fae9b01..fa6a63f 100644 --- a/chrome/browser/ui/views/location_bar/location_bar_view.cc +++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc @@ -8,7 +8,6 @@ #include <gtk/gtk.h> #endif -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" @@ -42,6 +41,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/dragdrop/drag_drop_types.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc index 408c436..6f4b637 100644 --- a/chrome/browser/ui/views/location_bar/selected_keyword_view.cc +++ b/chrome/browser/ui/views/location_bar/selected_keyword_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/search_engines/template_url_model.h" @@ -12,6 +11,7 @@ #include "chrome/browser/ui/omnibox/location_bar_util.h" #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" SelectedKeywordView::SelectedKeywordView(const int background_images[], int contained_image, diff --git a/chrome/browser/ui/views/location_bar/star_view.cc b/chrome/browser/ui/views/location_bar/star_view.cc index ba9c882..c7bacbeb 100644 --- a/chrome/browser/ui/views/location_bar/star_view.cc +++ b/chrome/browser/ui/views/location_bar/star_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/location_bar/star_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/command_updater.h" @@ -12,6 +11,7 @@ #include "chrome/browser/ui/views/browser_dialogs.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" StarView::StarView(CommandUpdater* command_updater) diff --git a/chrome/browser/ui/views/login_view.cc b/chrome/browser/ui/views/login_view.cc index da1dc067..5597a21 100644 --- a/chrome/browser/ui/views/login_view.cc +++ b/chrome/browser/ui/views/login_view.cc @@ -6,11 +6,11 @@ #include <string> -#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/grid_layout.h" #include "views/controls/label.h" #include "views/controls/textfield/textfield.h" diff --git a/chrome/browser/ui/views/notifications/balloon_view.cc b/chrome/browser/ui/views/notifications/balloon_view.cc index dfefc7f..b60466c 100644 --- a/chrome/browser/ui/views/notifications/balloon_view.cc +++ b/chrome/browser/ui/views/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/notifications/balloon.h" @@ -28,6 +27,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "ui/base/animation/slide_animation.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/button/button.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/ui/views/options/advanced_contents_view.cc b/chrome/browser/ui/views/options/advanced_contents_view.cc index 51a0073..e1a4b5e 100644 --- a/chrome/browser/ui/views/options/advanced_contents_view.cc +++ b/chrome/browser/ui/views/options/advanced_contents_view.cc @@ -14,7 +14,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/i18n/rtl.h" @@ -58,6 +57,7 @@ #include "net/base/ssl_config_service_win.h" #include "skia/ext/skia_utils_win.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/background.h" #include "views/controls/button/checkbox.h" diff --git a/chrome/browser/ui/views/options/advanced_page_view.cc b/chrome/browser/ui/views/options/advanced_page_view.cc index 276f7fd..3e44ff2 100644 --- a/chrome/browser/ui/views/options/advanced_page_view.cc +++ b/chrome/browser/ui/views/options/advanced_page_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/options/advanced_page_view.h" -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.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 "ui/base/message_box_flags.h" #include "views/controls/message_box_view.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/options/content_filter_page_view.cc b/chrome/browser/ui/views/options/content_filter_page_view.cc index ce5dbdd..fbac33a 100644 --- a/chrome/browser/ui/views/options/content_filter_page_view.cc +++ b/chrome/browser/ui/views/options/content_filter_page_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/options/content_filter_page_view.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_settings/content_settings_details.h" @@ -21,6 +20,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 "views/controls/button/radio_button.h" #include "views/grid_layout.h" #include "views/standard_layout.h" diff --git a/chrome/browser/ui/views/options/content_page_view.cc b/chrome/browser/ui/views/options/content_page_view.cc index 9c2d161..0ff116c 100644 --- a/chrome/browser/ui/views/options/content_page_view.cc +++ b/chrome/browser/ui/views/options/content_page_view.cc @@ -11,7 +11,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/string_util.h" #include "chrome/browser/autofill/autofill_dialog.h" @@ -32,6 +31,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/button/radio_button.h" #include "views/grid_layout.h" #include "views/standard_layout.h" diff --git a/chrome/browser/ui/views/options/content_settings_window_view.cc b/chrome/browser/ui/views/options/content_settings_window_view.cc index b9229bd..6cc1a64 100644 --- a/chrome/browser/ui/views/options/content_settings_window_view.cc +++ b/chrome/browser/ui/views/options/content_settings_window_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/options/content_settings_window_view.h" -#include "app/l10n_util.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" #include "chrome/browser/prefs/pref_service.h" @@ -19,6 +18,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/label.h" #include "views/widget/root_view.h" #include "views/window/dialog_delegate.h" diff --git a/chrome/browser/ui/views/options/cookie_filter_page_view.cc b/chrome/browser/ui/views/options/cookie_filter_page_view.cc index 916bdee..b8c3da0 100644 --- a/chrome/browser/ui/views/options/cookie_filter_page_view.cc +++ b/chrome/browser/ui/views/options/cookie_filter_page_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/options/cookie_filter_page_view.h" -#include "app/l10n_util.h" #include "chrome/browser/content_settings/host_content_settings_map.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/options/show_options_url.h" @@ -12,6 +11,7 @@ #include "chrome/common/pref_names.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/button/checkbox.h" #include "views/grid_layout.h" #include "views/standard_layout.h" diff --git a/chrome/browser/ui/views/options/cookies_view.cc b/chrome/browser/ui/views/options/cookies_view.cc index d00ae73..74a871c 100644 --- a/chrome/browser/ui/views/options/cookies_view.cc +++ b/chrome/browser/ui/views/options/cookies_view.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/profiles/profile.h" @@ -20,6 +19,7 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "net/base/cookie_monster.h" +#include "ui/base/l10n/l10n_util.h" #include "views/border.h" #include "views/grid_layout.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/options/exception_editor_view.cc b/chrome/browser/ui/views/options/exception_editor_view.cc index a27143d..a693f1e 100644 --- a/chrome/browser/ui/views/options/exception_editor_view.cc +++ b/chrome/browser/ui/views/options/exception_editor_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/options/exception_editor_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/content_exceptions_table_model.h" #include "googleurl/src/url_canon.h" @@ -12,6 +11,7 @@ #include "grit/app_resources.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/grid_layout.h" #include "views/controls/image_view.h" diff --git a/chrome/browser/ui/views/options/exceptions_page_view.cc b/chrome/browser/ui/views/options/exceptions_page_view.cc index 51246b1..cc8d485 100644 --- a/chrome/browser/ui/views/options/exceptions_page_view.cc +++ b/chrome/browser/ui/views/options/exceptions_page_view.cc @@ -4,13 +4,13 @@ #include "chrome/browser/ui/views/options/exceptions_page_view.h" -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/prefs/pref_service.h" #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/text/text_elider.h" #include "views/background.h" #include "views/controls/button/native_button.h" diff --git a/chrome/browser/ui/views/options/exceptions_view.cc b/chrome/browser/ui/views/options/exceptions_view.cc index 219205c..5d4d9ae 100644 --- a/chrome/browser/ui/views/options/exceptions_view.cc +++ b/chrome/browser/ui/views/options/exceptions_view.cc @@ -7,12 +7,12 @@ #include <algorithm> #include <vector> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/views/options/content_exceptions_table_view.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "gfx/rect.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/button/native_button.h" #include "views/controls/label.h" #include "views/controls/table/table_view.h" diff --git a/chrome/browser/ui/views/options/fonts_languages_window_view.cc b/chrome/browser/ui/views/options/fonts_languages_window_view.cc index b1cd4bc..70b0492 100644 --- a/chrome/browser/ui/views/options/fonts_languages_window_view.cc +++ b/chrome/browser/ui/views/options/fonts_languages_window_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/options/fonts_languages_window_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/views/options/fonts_page_view.h" @@ -13,6 +12,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/tabbed_pane/tabbed_pane.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/options/fonts_page_view.cc b/chrome/browser/ui/views/options/fonts_page_view.cc index 7345d8b..1f149df 100644 --- a/chrome/browser/ui/views/options/fonts_page_view.cc +++ b/chrome/browser/ui/views/options/fonts_page_view.cc @@ -11,7 +11,6 @@ #include <vector> -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -27,6 +26,7 @@ #include "grit/theme_resources.h" #include "grit/locale_settings.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/controls/button/native_button.h" #include "views/grid_layout.h" diff --git a/chrome/browser/ui/views/options/general_page_view.cc b/chrome/browser/ui/views/options/general_page_view.cc index d32b19b..07e4b11 100644 --- a/chrome/browser/ui/views/options/general_page_view.cc +++ b/chrome/browser/ui/views/options/general_page_view.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/message_loop.h" #include "base/string16.h" @@ -35,6 +34,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" #include "ui/base/models/combobox_model.h" #include "views/controls/button/radio_button.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/options/languages_page_view.cc b/chrome/browser/ui/views/options/languages_page_view.cc index 1af9d7b..f6eca8c 100644 --- a/chrome/browser/ui/views/options/languages_page_view.cc +++ b/chrome/browser/ui/views/options/languages_page_view.cc @@ -9,7 +9,6 @@ #include "chrome/browser/ui/views/options/languages_page_view.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/string_util.h" @@ -31,6 +30,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "unicode/uloc.h" #include "views/controls/button/radio_button.h" diff --git a/chrome/browser/ui/views/options/options_group_view.cc b/chrome/browser/ui/views/options/options_group_view.cc index dcdfd29..7b2edfd 100644 --- a/chrome/browser/ui/views/options/options_group_view.cc +++ b/chrome/browser/ui/views/options/options_group_view.cc @@ -7,7 +7,6 @@ #include "chrome/browser/ui/views/options/options_group_view.h" -#include "app/l10n_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "gfx/canvas.h" @@ -15,6 +14,7 @@ #include "gfx/native_theme_win.h" #include "grit/locale_settings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/grid_layout.h" #include "views/controls/label.h" diff --git a/chrome/browser/ui/views/options/options_window_view.cc b/chrome/browser/ui/views/options/options_window_view.cc index f59e57b..2d61da2 100644 --- a/chrome/browser/ui/views/options/options_window_view.cc +++ b/chrome/browser/ui/views/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/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" @@ -18,6 +17,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/tabbed_pane/tabbed_pane.h" #include "views/widget/root_view.h" #include "views/window/dialog_delegate.h" diff --git a/chrome/browser/ui/views/options/passwords_exceptions_window_view.cc b/chrome/browser/ui/views/options/passwords_exceptions_window_view.cc index 7138bc7..ed9c70d 100644 --- a/chrome/browser/ui/views/options/passwords_exceptions_window_view.cc +++ b/chrome/browser/ui/views/options/passwords_exceptions_window_view.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ui/views/options/passwords_exceptions_window_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/views/options/exceptions_page_view.h" #include "chrome/browser/ui/views/options/passwords_page_view.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/options/passwords_page_view.cc b/chrome/browser/ui/views/options/passwords_page_view.cc index d59cf95..134fb81 100644 --- a/chrome/browser/ui/views/options/passwords_page_view.cc +++ b/chrome/browser/ui/views/options/passwords_page_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/options/passwords_page_view.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" @@ -13,6 +12,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 "views/background.h" #include "views/controls/button/native_button.h" #include "views/grid_layout.h" diff --git a/chrome/browser/ui/views/options/plugin_filter_page_view.cc b/chrome/browser/ui/views/options/plugin_filter_page_view.cc index a8bc607..34b4d730 100644 --- a/chrome/browser/ui/views/options/plugin_filter_page_view.cc +++ b/chrome/browser/ui/views/options/plugin_filter_page_view.cc @@ -4,11 +4,11 @@ #include "chrome/browser/ui/views/options/plugin_filter_page_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/options/show_options_url.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/grid_layout.h" #include "views/standard_layout.h" diff --git a/chrome/browser/ui/views/options/simple_content_exceptions_view.cc b/chrome/browser/ui/views/options/simple_content_exceptions_view.cc index 695686f..d67093a 100644 --- a/chrome/browser/ui/views/options/simple_content_exceptions_view.cc +++ b/chrome/browser/ui/views/options/simple_content_exceptions_view.cc @@ -7,11 +7,11 @@ #include <algorithm> #include <vector> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "gfx/rect.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/button/native_button.h" #include "views/controls/table/table_view.h" #include "views/grid_layout.h" diff --git a/chrome/browser/ui/views/page_info_bubble_view.cc b/chrome/browser/ui/views/page_info_bubble_view.cc index fb974ab..92bc3d5 100644 --- a/chrome/browser/ui/views/page_info_bubble_view.cc +++ b/chrome/browser/ui/views/page_info_bubble_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/page_info_bubble_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/cert_store.h" @@ -16,6 +15,7 @@ #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/image_view.h" #include "views/controls/label.h" #include "views/controls/separator.h" diff --git a/chrome/browser/ui/views/reload_button.cc b/chrome/browser/ui/views/reload_button.cc index 5a2b5bce..80a469a 100644 --- a/chrome/browser/ui/views/reload_button.cc +++ b/chrome/browser/ui/views/reload_button.cc @@ -4,13 +4,13 @@ #include "chrome/browser/ui/views/reload_button.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/views/event_utils.h" #include "chrome/browser/ui/views/location_bar/location_bar_view.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" //////////////////////////////////////////////////////////////////////////////// // ReloadButton, public: diff --git a/chrome/browser/ui/views/repost_form_warning_view.cc b/chrome/browser/ui/views/repost_form_warning_view.cc index ec83568..36ec052 100644 --- a/chrome/browser/ui/views/repost_form_warning_view.cc +++ b/chrome/browser/ui/views/repost_form_warning_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/repost_form_warning_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_window.h" @@ -12,6 +11,7 @@ #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/message_box_flags.h" #include "views/controls/message_box_view.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/restart_message_box.cc b/chrome/browser/ui/views/restart_message_box.cc index e14dce3..ce9afda 100644 --- a/chrome/browser/ui/views/restart_message_box.cc +++ b/chrome/browser/ui/views/restart_message_box.cc @@ -4,10 +4,10 @@ #include "chrome/browser/ui/views/restart_message_box.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.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 "views/controls/message_box_view.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/sad_tab_view.cc b/chrome/browser/ui/views/sad_tab_view.cc index 02affe9..554d2d2 100644 --- a/chrome/browser/ui/views/sad_tab_view.cc +++ b/chrome/browser/ui/views/sad_tab_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/sad_tab_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/google/google_util.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -18,6 +17,7 @@ #include "grit/locale_settings.h" #include "grit/theme_resources.h" #include "third_party/skia/include/effects/SkGradientShader.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" static const int kSadTabOffset = -64; diff --git a/chrome/browser/ui/views/select_file_dialog.cc b/chrome/browser/ui/views/select_file_dialog.cc index 1570a9e..edc603f 100644 --- a/chrome/browser/ui/views/select_file_dialog.cc +++ b/chrome/browser/ui/views/select_file_dialog.cc @@ -4,7 +4,6 @@ #include "chrome/browser/shell_dialogs.h" -#include "app/l10n_util.h" #include "base/callback.h" #include "base/file_path.h" #include "base/json/json_reader.h" @@ -24,6 +23,7 @@ #include "chrome/browser/ui/views/html_dialog_view.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "views/window/non_client_view.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/shell_dialogs_win.cc b/chrome/browser/ui/views/shell_dialogs_win.cc index 710aac2..2b1a48f 100644 --- a/chrome/browser/ui/views/shell_dialogs_win.cc +++ b/chrome/browser/ui/views/shell_dialogs_win.cc @@ -11,7 +11,6 @@ #include <algorithm> #include <set> -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/message_loop.h" #include "base/scoped_comptr_win.h" @@ -24,6 +23,7 @@ #include "gfx/font.h" #include "grit/app_strings.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" // This function takes the output of a SaveAs dialog: a filename, a filter and // the extension originally suggested to the user (shown in the dialog box) and diff --git a/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc b/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc index dd2eae4..35a5ee1 100644 --- a/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc +++ b/chrome/browser/ui/views/ssl_client_certificate_selector_win.cc @@ -8,7 +8,6 @@ #include <cryptuiapi.h> #pragma comment(lib, "cryptui.lib") -#include "app/l10n_util.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" @@ -17,6 +16,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "grit/generated_resources.h" #include "net/url_request/url_request.h" +#include "ui/base/l10n/l10n_util.h" namespace browser { diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc index f36273f..cb0140f 100644 --- a/chrome/browser/ui/views/tabs/base_tab.cc +++ b/chrome/browser/ui/views/tabs/base_tab.cc @@ -6,7 +6,6 @@ #include <limits> -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" @@ -20,9 +19,10 @@ #include "grit/app_resources.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" -#include "ui/base/resource/resource_bundle.h" #include "ui/base/animation/slide_animation.h" #include "ui/base/animation/throb_animation.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/resource/resource_bundle.h" #include "ui/base/theme_provider.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/ui/views/tabs/side_tab_strip.cc b/chrome/browser/ui/views/tabs/side_tab_strip.cc index dfc3cf0..facad68 100644 --- a/chrome/browser/ui/views/tabs/side_tab_strip.cc +++ b/chrome/browser/ui/views/tabs/side_tab_strip.cc @@ -4,13 +4,13 @@ #include "chrome/browser/ui/views/tabs/side_tab_strip.h" -#include "app/l10n_util.h" #include "chrome/browser/ui/view_ids.h" #include "chrome/browser/ui/views/tabs/side_tab.h" #include "chrome/browser/ui/views/tabs/tab_strip_controller.h" #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/image_button.h" diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc index 906d360..8e60c2d 100644 --- a/chrome/browser/ui/views/tabs/tab_strip.cc +++ b/chrome/browser/ui/views/tabs/tab_strip.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "base/stl_util-inl.h" #include "base/utf_string_conversions.h" @@ -22,6 +21,7 @@ #include "grit/theme_resources.h" #include "ui/base/animation/animation_container.h" #include "ui/base/dragdrop/drag_drop_types.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/image_view.h" #include "views/widget/default_theme_provider.h" diff --git a/chrome/browser/ui/views/task_manager_view.cc b/chrome/browser/ui/views/task_manager_view.cc index b4a54ce..0460c6d 100644 --- a/chrome/browser/ui/views/task_manager_view.cc +++ b/chrome/browser/ui/views/task_manager_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/task_manager/task_manager.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/metrics/stats_table.h" @@ -21,6 +20,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/models/table_model_observer.h" #include "views/accelerator.h" #include "views/background.h" diff --git a/chrome/browser/ui/views/theme_install_bubble_view.cc b/chrome/browser/ui/views/theme_install_bubble_view.cc index c86877f..2fe3d84 100644 --- a/chrome/browser/ui/views/theme_install_bubble_view.cc +++ b/chrome/browser/ui/views/theme_install_bubble_view.cc @@ -4,12 +4,12 @@ #include "chrome/browser/ui/views/theme_install_bubble_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/notification_service.h" #include "gfx/canvas_skia.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/toolbar_view.cc b/chrome/browser/ui/views/toolbar_view.cc index 9ff2d8f..3984bd0 100644 --- a/chrome/browser/ui/views/toolbar_view.cc +++ b/chrome/browser/ui/views/toolbar_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/toolbar_view.h" -#include "app/l10n_util.h" #include "base/i18n/number_formatting.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -30,6 +29,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/button/button_dropdown.h" #include "views/focus/view_storage.h" diff --git a/chrome/browser/ui/views/uninstall_view.cc b/chrome/browser/ui/views/uninstall_view.cc index c0f2ca6..e9abfabc 100644 --- a/chrome/browser/ui/views/uninstall_view.cc +++ b/chrome/browser/ui/views/uninstall_view.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/uninstall_view.h" -#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/process_util.h" #include "base/string16.h" @@ -13,6 +12,7 @@ #include "chrome/common/result_codes.h" #include "chrome/installer/util/browser_distribution.h" #include "chrome/installer/util/shell_util.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/button/checkbox.h" #include "views/controls/label.h" #include "views/standard_layout.h" diff --git a/chrome/browser/ui/views/update_recommended_message_box.cc b/chrome/browser/ui/views/update_recommended_message_box.cc index d03eabb..0f619ed 100644 --- a/chrome/browser/ui/views/update_recommended_message_box.cc +++ b/chrome/browser/ui/views/update_recommended_message_box.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/update_recommended_message_box.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" @@ -13,6 +12,7 @@ #include "chrome/common/pref_names.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 "views/controls/message_box_view.h" #include "views/window/window.h" diff --git a/chrome/browser/ui/views/url_picker.cc b/chrome/browser/ui/views/url_picker.cc index 88e4c5f..4e4ef3b 100644 --- a/chrome/browser/ui/views/url_picker.cc +++ b/chrome/browser/ui/views/url_picker.cc @@ -4,7 +4,6 @@ #include "chrome/browser/ui/views/url_picker.h" -#include "app/l10n_util.h" #include "base/stl_util-inl.h" #include "base/string16.h" #include "base/utf_string_conversions.h" @@ -18,6 +17,7 @@ #include "grit/locale_settings.h" #include "net/base/net_util.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/table_model.h" #include "ui/base/resource/resource_bundle.h" #include "views/background.h" diff --git a/chrome/browser/ui/views/user_data_dir_dialog.cc b/chrome/browser/ui/views/user_data_dir_dialog.cc index 83fcf8a..28f8763 100644 --- a/chrome/browser/ui/views/user_data_dir_dialog.cc +++ b/chrome/browser/ui/views/user_data_dir_dialog.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 "app/l10n_util.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "chrome/browser/ui/views/user_data_dir_dialog.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 "views/controls/message_box_view.h" #include "views/widget/widget.h" diff --git a/chrome/browser/ui/views/wrench_menu.cc b/chrome/browser/ui/views/wrench_menu.cc index 6898fcd..2105f03 100644 --- a/chrome/browser/ui/views/wrench_menu.cc +++ b/chrome/browser/ui/views/wrench_menu.cc @@ -6,7 +6,6 @@ #include <cmath> -#include "app/l10n_util.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" #include "chrome/app/chrome_command_ids.h" @@ -25,6 +24,7 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "third_party/skia/include/core/SkPaint.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/background.h" #include "views/controls/button/image_button.h" diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc index eea663c..2ab6f4c 100644 --- a/chrome/browser/webdata/web_database.cc +++ b/chrome/browser/webdata/web_database.cc @@ -9,7 +9,6 @@ #include <set> #include <string> -#include "app/l10n_util.h" #include "app/sql/statement.h" #include "app/sql/transaction.h" #include "base/string_number_conversions.h" @@ -29,6 +28,7 @@ #include "chrome/common/notification_service.h" #include "gfx/codec/png_codec.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/form_field.h" #include "webkit/glue/password_form.h" diff --git a/chrome/common/child_process_info.cc b/chrome/common/child_process_info.cc index 69122cc..9084646 100644 --- a/chrome/common/child_process_info.cc +++ b/chrome/common/child_process_info.cc @@ -6,7 +6,6 @@ #include <limits> -#include "app/l10n_util.h" #include "base/atomicops.h" #include "base/i18n/rtl.h" #include "base/logging.h" @@ -15,6 +14,7 @@ #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" ChildProcessInfo::ChildProcessInfo(ProcessType type, int id) : type_(type), diff --git a/chrome/common/common_glue.cc b/chrome/common/common_glue.cc index 653742a..4573dfb 100644 --- a/chrome/common/common_glue.cc +++ b/chrome/common/common_glue.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include "app/app_switches.h" -#include "app/l10n_util.h" #include "base/command_line.h" #include "base/path_service.h" #include "base/string16.h" @@ -13,6 +12,7 @@ #include "chrome/common/chrome_switches.h" #include "chrome/plugin/npobject_util.h" #include "googleurl/src/url_util.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/ui_base_switches.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/common/extensions/extension.cc b/chrome/common/extensions/extension.cc index e4384ca..44641bf 100644 --- a/chrome/common/extensions/extension.cc +++ b/chrome/common/extensions/extension.cc @@ -6,7 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/base64.h" #include "base/basictypes.h" #include "base/command_line.h" @@ -40,6 +39,7 @@ #include "grit/generated_resources.h" #include "net/base/registry_controlled_domain.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/image_decoder.h" namespace keys = extension_manifest_keys; diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc index 9472f03..460a7a0 100644 --- a/chrome/common/extensions/extension_file_util.cc +++ b/chrome/common/extensions/extension_file_util.cc @@ -7,7 +7,6 @@ #include <map> #include <vector> -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/logging.h" #include "base/metrics/histogram.h" @@ -25,6 +24,7 @@ #include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/file_stream.h" +#include "ui/base/l10n/l10n_util.h" namespace errors = extension_manifest_errors; diff --git a/chrome/common/extensions/extension_l10n_util.cc b/chrome/common/extensions/extension_l10n_util.cc index 994ab83..dff8f5e 100644 --- a/chrome/common/extensions/extension_l10n_util.cc +++ b/chrome/common/extensions/extension_l10n_util.cc @@ -8,7 +8,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/linked_ptr.h" #include "base/logging.h" @@ -20,6 +19,7 @@ #include "chrome/common/extensions/extension_message_bundle.h" #include "chrome/common/json_value_serializer.h" #include "chrome/common/url_constants.h" +#include "ui/base/l10n/l10n_util.h" #include "unicode/uloc.h" namespace errors = extension_manifest_errors; diff --git a/chrome/common/extensions/extension_l10n_util_unittest.cc b/chrome/common/extensions/extension_l10n_util_unittest.cc index 0ec7e97..5a318bc 100644 --- a/chrome/common/extensions/extension_l10n_util_unittest.cc +++ b/chrome/common/extensions/extension_l10n_util_unittest.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/file_path.h" #include "base/file_util.h" #include "base/linked_ptr.h" @@ -16,6 +15,7 @@ #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_message_bundle.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/l10n/l10n_util.h" namespace errors = extension_manifest_errors; namespace keys = extension_manifest_keys; diff --git a/chrome/common/extensions/extension_message_bundle.cc b/chrome/common/extensions/extension_message_bundle.cc index ea28c83..e6e00af 100644 --- a/chrome/common/extensions/extension_message_bundle.cc +++ b/chrome/common/extensions/extension_message_bundle.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/hash_tables.h" #include "base/i18n/rtl.h" #include "base/lazy_instance.h" @@ -20,6 +19,7 @@ #include "chrome/common/extensions/extension_constants.h" #include "chrome/common/extensions/extension_error_utils.h" #include "chrome/common/extensions/extension_l10n_util.h" +#include "ui/base/l10n/l10n_util.h" namespace errors = extension_manifest_errors; diff --git a/chrome/common/extensions/extension_resource_unittest.cc b/chrome/common/extensions/extension_resource_unittest.cc index e7b3ef0..9f47666 100644 --- a/chrome/common/extensions/extension_resource_unittest.cc +++ b/chrome/common/extensions/extension_resource_unittest.cc @@ -4,7 +4,6 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/scoped_temp_dir.h" @@ -13,6 +12,7 @@ #include "chrome/common/extensions/extension_l10n_util.h" #include "chrome/common/extensions/extension_resource.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/l10n/l10n_util.h" TEST(ExtensionResourceTest, CreateEmptyResource) { ExtensionResource resource; diff --git a/chrome/common/extensions/extension_unittest.cc b/chrome/common/extensions/extension_unittest.cc index 6b2415f..5ee3a06 100644 --- a/chrome/common/extensions/extension_unittest.cc +++ b/chrome/common/extensions/extension_unittest.cc @@ -8,7 +8,6 @@ #include <gtk/gtk.h> #endif -#include "app/l10n_util.h" #include "base/format_macros.h" #include "base/file_path.h" #include "base/file_util.h" @@ -32,6 +31,7 @@ #include "net/base/mock_host_resolver.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" namespace keys = extension_manifest_keys; namespace values = extension_manifest_values; diff --git a/chrome/common/json_schema_validator.cc b/chrome/common/json_schema_validator.cc index a76b2d9..7d43543 100644 --- a/chrome/common/json_schema_validator.cc +++ b/chrome/common/json_schema_validator.cc @@ -7,10 +7,10 @@ #include <cfloat> #include <cmath> -#include "app/l10n_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/values.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/common/net/net_resource_provider.cc b/chrome/common/net/net_resource_provider.cc index 068952f..346d763 100644 --- a/chrome/common/net/net_resource_provider.cc +++ b/chrome/common/net/net_resource_provider.cc @@ -6,13 +6,13 @@ #include <string> -#include "app/l10n_util.h" #include "base/string_piece.h" #include "base/values.h" #include "chrome/common/jstemplate_builder.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" #include "grit/net_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" namespace { diff --git a/chrome/common/net/x509_certificate_model.cc b/chrome/common/net/x509_certificate_model.cc index 0ec2bff..076d974 100644 --- a/chrome/common/net/x509_certificate_model.cc +++ b/chrome/common/net/x509_certificate_model.cc @@ -6,9 +6,9 @@ #include <unicode/uidna.h> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace x509_certificate_model { diff --git a/chrome/common/security_filter_peer.cc b/chrome/common/security_filter_peer.cc index 37db9a7..93277a8 100644 --- a/chrome/common/security_filter_peer.cc +++ b/chrome/common/security_filter_peer.cc @@ -4,10 +4,10 @@ #include "chrome/common/security_filter_peer.h" -#include "app/l10n_util.h" #include "grit/generated_resources.h" #include "net/base/net_errors.h" #include "net/http/http_response_headers.h" +#include "ui/base/l10n/l10n_util.h" SecurityFilterPeer::SecurityFilterPeer( webkit_glue::ResourceLoaderBridge* resource_loader_bridge, diff --git a/chrome/common/time_format.cc b/chrome/common/time_format.cc index 9de3a402..249aae2 100644 --- a/chrome/common/time_format.cc +++ b/chrome/common/time_format.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/l10n_util.h" #include "base/lazy_instance.h" #include "base/logging.h" #include "base/scoped_ptr.h" @@ -15,6 +14,7 @@ #include "base/time.h" #include "base/utf_string_conversions.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" #include "unicode/datefmt.h" #include "unicode/locid.h" #include "unicode/plurfmt.h" diff --git a/chrome/common/web_apps.cc b/chrome/common/web_apps.cc index 2761396..f178b4c 100644 --- a/chrome/common/web_apps.cc +++ b/chrome/common/web_apps.cc @@ -7,7 +7,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/json/json_reader.h" #include "base/string16.h" #include "base/string_number_conversions.h" @@ -26,6 +25,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebNodeList.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/glue/dom_operations.h" diff --git a/chrome/default_plugin/plugin_impl_mac.mm b/chrome/default_plugin/plugin_impl_mac.mm index 0244e62..77fb9e3 100644 --- a/chrome/default_plugin/plugin_impl_mac.mm +++ b/chrome/default_plugin/plugin_impl_mac.mm @@ -6,7 +6,6 @@ #import <Cocoa/Cocoa.h> -#include "app/l10n_util_mac.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" @@ -14,6 +13,7 @@ #include "googleurl/src/gurl.h" #include "grit/default_plugin_resources.h" #include "grit/webkit_strings.h" +#include "ui/base/l10n/l10n_util_mac.h" #include "ui/base/resource/resource_bundle.h" #include "unicode/locid.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/plugin/plugin_thread.cc b/chrome/plugin/plugin_thread.cc index 280a6a2..099d4e3 100644 --- a/chrome/plugin/plugin_thread.cc +++ b/chrome/plugin/plugin_thread.cc @@ -40,11 +40,11 @@ #if defined(USE_X11) #include "ui/base/x/x11_util.h" #elif defined(OS_MACOSX) -#include "app/l10n_util.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_cftyperef.h" #include "base/sys_string_conversions.h" #include "grit/chromium_strings.h" +#include "ui/base/l10n/l10n_util.h" #endif static base::LazyInstance<base::ThreadLocalPointer<PluginThread> > lazy_tls( diff --git a/chrome/renderer/autofill_helper.cc b/chrome/renderer/autofill_helper.cc index ec63c51..f93e8c0 100644 --- a/chrome/renderer/autofill_helper.cc +++ b/chrome/renderer/autofill_helper.cc @@ -4,7 +4,6 @@ #include "chrome/renderer/autofill_helper.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/render_messages.h" @@ -18,6 +17,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputElement.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/form_data.h" #include "webkit/glue/form_field.h" #include "webkit/glue/password_form.h" diff --git a/chrome/renderer/blocked_plugin.cc b/chrome/renderer/blocked_plugin.cc index 4653bf3..d73192f 100644 --- a/chrome/renderer/blocked_plugin.cc +++ b/chrome/renderer/blocked_plugin.cc @@ -4,7 +4,6 @@ #include "chrome/renderer/blocked_plugin.h" -#include "app/l10n_util.h" #include "base/string_piece.h" #include "base/string_util.h" #include "base/values.h" @@ -22,6 +21,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextCaseSensitivity.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebVector.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "webkit/glue/webpreferences.h" #include "webkit/plugins/npapi/plugin_group.h" diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index abb2a9f..820f6a0 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -4,7 +4,6 @@ #include "chrome/renderer/localized_error.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/string16.h" @@ -19,6 +18,7 @@ #include "net/base/escape.h" #include "net/base/net_errors.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/webkit_glue.h" using WebKit::WebURLError; diff --git a/chrome/renderer/pepper_plugin_delegate_impl.cc b/chrome/renderer/pepper_plugin_delegate_impl.cc index 2492e90..f4c2923 100644 --- a/chrome/renderer/pepper_plugin_delegate_impl.cc +++ b/chrome/renderer/pepper_plugin_delegate_impl.cc @@ -6,7 +6,6 @@ #include <cmath> -#include "app/l10n_util.h" #include "app/surface/transport_dib.h" #include "base/callback.h" #include "base/file_path.h" @@ -41,6 +40,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileChooserParams.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginContainer.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/fileapi/file_system_callback_dispatcher.h" #include "webkit/plugins/npapi/webplugin.h" #include "webkit/plugins/ppapi/ppb_file_io_impl.h" diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc index 09d4859f..41b317c 100644 --- a/chrome/renderer/print_web_view_helper.cc +++ b/chrome/renderer/print_web_view_helper.cc @@ -6,7 +6,6 @@ #include <string> -#include "app/l10n_util.h" #include "base/logging.h" #include "base/process_util.h" #include "base/utf_string_conversions.h" @@ -25,6 +24,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/l10n/l10n_util.h" #include "webkit/glue/webkit_glue.h" using printing::ConvertPixelsToPoint; diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm index bc37f10..5dcd220 100644 --- a/chrome/renderer/print_web_view_helper_mac.mm +++ b/chrome/renderer/print_web_view_helper_mac.mm @@ -6,7 +6,6 @@ #import <AppKit/AppKit.h> -#include "app/l10n_util.h" #include "base/logging.h" #include "chrome/common/render_messages.h" #include "chrome/common/render_messages_params.h" @@ -17,6 +16,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebCanvas.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebRect.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" +#include "ui/base/l10n/l10n_util.h" using WebKit::WebFrame; using WebKit::WebCanvas; diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index d2f9250..ff9a209 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -9,7 +9,6 @@ #include <string> #include <vector> -#include "app/l10n_util.h" #include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.h" @@ -158,6 +157,7 @@ #include "third_party/cld/encodings/compact_lang_det/win/cld_unicodetext.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/message_box_flags.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "v8/include/v8.h" #include "v8/include/v8-testing.h" diff --git a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc index ea5af10..32805f0 100644 --- a/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc +++ b/chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc @@ -7,7 +7,6 @@ #include <list> #include <map> -#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "base/logging.h" #include "base/message_loop.h" @@ -17,6 +16,7 @@ #include "base/utf_string_conversions.h" #include "chrome/renderer/safe_browsing/feature_extractor_clock.h" #include "chrome/renderer/safe_browsing/features.h" +#include "ui/base/l10n/l10n_util.h" #include "unicode/ubrk.h" namespace safe_browsing { diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc index 021aaf8..eae43bc 100644 --- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc +++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc @@ -7,7 +7,6 @@ #include <map> #include <vector> -#include "app/l10n_util.h" #include "base/file_util.h" #include "base/md5.h" #include "base/rand_util.h" @@ -28,6 +27,7 @@ #include "jingle/notifier/listener/push_notifications_thread.h" #include "jingle/notifier/listener/talk_mediator_impl.h" #include "net/url_request/url_request_status.h" +#include "ui/base/l10n/l10n_util.h" // The real guts of CloudPrintProxyBackend, to keep the public client API clean. class CloudPrintProxyBackend::Core diff --git a/chrome/service/cloud_print/print_system_win.cc b/chrome/service/cloud_print/print_system_win.cc index a6427cd..4144090 100644 --- a/chrome/service/cloud_print/print_system_win.cc +++ b/chrome/service/cloud_print/print_system_win.cc @@ -7,7 +7,6 @@ #include <objidl.h> #include <winspool.h> -#include "app/l10n_util.h" #include "base/file_path.h" #include "base/scoped_ptr.h" #include "base/utf_string_conversions.h" @@ -25,6 +24,7 @@ #include "printing/backend/win_helper.h" #include "printing/native_metafile.h" #include "printing/page_range.h" +#include "ui/base/l10n/l10n_util.h" using base::win::ScopedBstr; using base::win::ScopedComPtr; diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp index aca4c87..cf46036 100644 --- a/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp +++ b/chrome/third_party/mozilla_security_manager/nsNSSCertHelper.cpp @@ -44,7 +44,6 @@ #include <prprf.h> #include <unicode/uidna.h> -#include "app/l10n_util.h" #include "base/i18n/number_formatting.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" @@ -53,6 +52,7 @@ #include "grit/generated_resources.h" #include "net/base/net_util.h" #include "net/third_party/mozilla_security_manager/nsNSSCertTrust.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp b/chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp index 74624ab..d4a58ab 100644 --- a/chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp +++ b/chrome/third_party/mozilla_security_manager/nsNSSCertificate.cpp @@ -42,8 +42,8 @@ #include <pk11func.h> -#include "app/l10n_util.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace mozilla_security_manager { diff --git a/chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.cpp b/chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.cpp index 234e4dd..0104468 100644 --- a/chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.cpp +++ b/chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.cpp @@ -37,8 +37,8 @@ #include "chrome/third_party/mozilla_security_manager/nsUsageArrayHelper.h" -#include "app/l10n_util.h" #include "grit/generated_resources.h" +#include "ui/base/l10n/l10n_util.h" namespace mozilla_security_manager { diff --git a/ui/base/dragdrop/os_exchange_data_provider_win.cc b/ui/base/dragdrop/os_exchange_data_provider_win.cc index f8488a3..657a917 100644 --- a/ui/base/dragdrop/os_exchange_data_provider_win.cc +++ b/ui/base/dragdrop/os_exchange_data_provider_win.cc @@ -4,7 +4,6 @@ #include "ui/base/dragdrop/os_exchange_data_provider_win.h" -#include "app/l10n_util.h" #include "base/file_path.h" #include "base/i18n/file_util_icu.h" #include "base/logging.h" @@ -17,6 +16,7 @@ #include "grit/app_strings.h" #include "net/base/net_util.h" #include "ui/base/clipboard/clipboard_util_win.h" +#include "ui/base/l10n/l10n_util.h" namespace ui { diff --git a/ui/base/l10n/l10n_font_util.cc b/ui/base/l10n/l10n_font_util.cc index 19f058f..9228de9 100644 --- a/ui/base/l10n/l10n_font_util.cc +++ b/ui/base/l10n/l10n_font_util.cc @@ -4,7 +4,7 @@ #include "ui/base/l10n/l10n_font_util.h" -#include "app/l10n_util.h" +#include "ui/base/l10n/l10n_util.h" #include "base/logging.h" #include "base/string_number_conversions.h" #include "base/utf_string_conversions.h" diff --git a/app/l10n_util.cc b/ui/base/l10n/l10n_util.cc index 64189e99..26e12c85 100644 --- a/app/l10n_util.cc +++ b/ui/base/l10n/l10n_util.cc @@ -1,8 +1,8 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // 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 "ui/base/l10n/l10n_util.h" #if defined(TOOLKIT_USES_GTK) #include <glib/gutils.h> @@ -12,7 +12,6 @@ #include <cstdlib> #include <iterator> -#include "app/l10n_util_collator.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/i18n/file_util_icu.h" @@ -26,15 +25,16 @@ #include "base/utf_string_conversions.h" #include "build/build_config.h" #include "gfx/canvas.h" +#include "ui/base/l10n/l10n_util_collator.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" #include "unicode/rbbi.h" #include "unicode/uloc.h" #if defined(OS_MACOSX) -#include "app/l10n_util_mac.h" +#include "ui/base/l10n/l10n_util_mac.h" #elif defined(OS_WIN) -#include "app/l10n_util_win.h" +#include "ui/base/l10n/l10n_util_win.h" #endif namespace { diff --git a/app/l10n_util.h b/ui/base/l10n/l10n_util.h index b76f5d9..e0c6150 100644 --- a/app/l10n_util.h +++ b/ui/base/l10n/l10n_util.h @@ -5,8 +5,8 @@ // This file contains utility functions for dealing with localized // content. -#ifndef APP_L10N_UTIL_H_ -#define APP_L10N_UTIL_H_ +#ifndef UI_BASE_L10N_L10N_UTIL_H_ +#define UI_BASE_L10N_L10N_UTIL_H_ #pragma once #include <algorithm> @@ -22,7 +22,7 @@ #include "base/string_util.h" #if defined(OS_MACOSX) -#include "app/l10n_util_mac.h" +#include "ui/base/l10n/l10n_util_mac.h" #endif // OS_MACOSX namespace l10n_util { @@ -158,4 +158,4 @@ void GetAcceptLanguagesForLocale(const std::string& display_locale, } // namespace l10n_util -#endif // APP_L10N_UTIL_H_ +#endif // UI_BASE_L10N_L10N_UTIL_H_ diff --git a/app/l10n_util_collator.h b/ui/base/l10n/l10n_util_collator.h index bcbfd82..b2c3b9b 100644 --- a/app/l10n_util_collator.h +++ b/ui/base/l10n/l10n_util_collator.h @@ -1,9 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef APP_L10N_UTIL_COLLATOR_H_ -#define APP_L10N_UTIL_COLLATOR_H_ +#ifndef UI_BASE_L10N_L10N_UTIL_COLLATOR_H_ +#define UI_BASE_L10N_L10N_UTIL_COLLATOR_H_ #pragma once #include <algorithm> @@ -151,4 +151,4 @@ void SortVectorWithStringKey(const std::string& locale, } // namespace l10n_util -#endif // APP_L10N_UTIL_COLLATOR_H_ +#endif // UI_BASE_L10N_L10N_UTIL_COLLATOR_H_ diff --git a/app/l10n_util_mac.h b/ui/base/l10n/l10n_util_mac.h index 309a7f0..73eaee6 100644 --- a/app/l10n_util_mac.h +++ b/ui/base/l10n/l10n_util_mac.h @@ -1,9 +1,9 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef APP_L10N_UTIL_MAC_H_ -#define APP_L10N_UTIL_MAC_H_ +#ifndef UI_BASE_L10N_L10N_UTIL_MAC_H_ +#define UI_BASE_L10N_L10N_UTIL_MAC_H_ #pragma once #include <string> @@ -79,4 +79,4 @@ const std::string& GetLocaleOverride(); } // namespace l10n_util -#endif // APP_L10N_UTIL_MAC_H_ +#endif // UI_BASE_L10N_L10N_UTIL_MAC_H_ diff --git a/app/l10n_util_mac.mm b/ui/base/l10n/l10n_util_mac.mm index c0be5d8..528c486 100644 --- a/app/l10n_util_mac.mm +++ b/ui/base/l10n/l10n_util_mac.mm @@ -1,14 +1,14 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #import <Foundation/Foundation.h> -#include "app/l10n_util.h" -#include "app/l10n_util_mac.h" #include "base/sys_string_conversions.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_mac.h" namespace { diff --git a/app/l10n_util_mac_unittest.mm b/ui/base/l10n/l10n_util_mac_unittest.mm index e6c4485..8084027 100644 --- a/app/l10n_util_mac_unittest.mm +++ b/ui/base/l10n/l10n_util_mac_unittest.mm @@ -1,13 +1,13 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. #import <Foundation/Foundation.h> #include "base/sys_string_conversions.h" -#include "app/l10n_util_mac.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" +#include "ui/base/l10n/l10n_util_mac.h" typedef PlatformTest L10nUtilMacTest; diff --git a/app/l10n_util_posix.cc b/ui/base/l10n/l10n_util_posix.cc index f5f8b56c..3b4604d 100644 --- a/app/l10n_util_posix.cc +++ b/ui/base/l10n/l10n_util_posix.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/app/l10n_util_unittest.cc b/ui/base/l10n/l10n_util_unittest.cc index d767c22..857c87e1 100644 --- a/app/l10n_util_unittest.cc +++ b/ui/base/l10n/l10n_util_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,11 +8,6 @@ #include <cstdlib> #endif -#include "app/l10n_util.h" -#include "app/l10n_util_collator.h" -#if !defined(OS_MACOSX) -#include "app/test/data/resource.h" -#endif #include "base/basictypes.h" #include "base/environment.h" #include "base/file_util.h" @@ -20,14 +15,21 @@ #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" -#if defined(OS_WIN) -#include "base/win/windows_version.h" -#endif #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_collator.h" #include "ui/base/ui_base_paths.h" #include "unicode/locid.h" +#if defined(OS_WIN) +#include "base/win/windows_version.h" +#endif + +#if !defined(OS_MACOSX) +#include "ui/base/test/data/resource.h" +#endif + namespace { class StringWrapper { diff --git a/app/l10n_util_win.cc b/ui/base/l10n/l10n_util_win.cc index d1e9392..65f5d3e 100644 --- a/app/l10n_util_win.cc +++ b/ui/base/l10n/l10n_util_win.cc @@ -1,20 +1,20 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "app/l10n_util_win.h" +#include "ui/base/l10n/l10n_util_win.h" #include <windowsx.h> #include <algorithm> #include <iterator> -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/lazy_instance.h" #include "base/string_number_conversions.h" #include "base/win/i18n.h" #include "base/win/windows_version.h" #include "grit/app_locale_settings.h" +#include "ui/base/l10n/l10n_util.h" namespace { diff --git a/app/l10n_util_win.h b/ui/base/l10n/l10n_util_win.h index 7a1dda5..52a4ecc 100644 --- a/app/l10n_util_win.h +++ b/ui/base/l10n/l10n_util_win.h @@ -1,9 +1,9 @@ -// Copyright (c) 2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef APP_L10N_UTIL_WIN_H_ -#define APP_L10N_UTIL_WIN_H_ +#ifndef UI_BASE_L10N_L10N_UTIL_WIN_H_ +#define UI_BASE_L10N_L10N_UTIL_WIN_H_ #pragma once #include <windows.h> @@ -60,4 +60,4 @@ const std::vector<std::string>& GetLocaleOverrides(); } // namespace l10n_util -#endif // APP_L10N_UTIL_WIN_H_ +#endif // UI_BASE_L10N_L10N_UTIL_WIN_H_ diff --git a/ui/base/models/button_menu_item_model.cc b/ui/base/models/button_menu_item_model.cc index 0ebb11f..9490b9d 100644 --- a/ui/base/models/button_menu_item_model.cc +++ b/ui/base/models/button_menu_item_model.cc @@ -4,7 +4,7 @@ #include "ui/base/models/button_menu_item_model.h" -#include "app/l10n_util.h" +#include "ui/base/l10n/l10n_util.h" namespace ui { diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc index 7094a70..ba7555b 100644 --- a/ui/base/models/simple_menu_model.cc +++ b/ui/base/models/simple_menu_model.cc @@ -4,8 +4,8 @@ #include "ui/base/models/simple_menu_model.h" -#include "app/l10n_util.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" namespace ui { diff --git a/ui/base/models/table_model.cc b/ui/base/models/table_model.cc index f9d9877..921ca89 100644 --- a/ui/base/models/table_model.cc +++ b/ui/base/models/table_model.cc @@ -4,10 +4,10 @@ #include "ui/base/models/table_model.h" -#include "app/l10n_util.h" -#include "app/l10n_util_collator.h" #include "base/logging.h" #include "third_party/skia/include/core/SkBitmap.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_collator.h" namespace ui { diff --git a/ui/base/resource/data_pack_unittest.cc b/ui/base/resource/data_pack_unittest.cc index fb15a07..9205fdf 100644 --- a/ui/base/resource/data_pack_unittest.cc +++ b/ui/base/resource/data_pack_unittest.cc @@ -16,7 +16,7 @@ TEST(DataPackTest, Load) { FilePath data_path; PathService::Get(base::DIR_SOURCE_ROOT, &data_path); data_path = data_path.Append( - FILE_PATH_LITERAL("app/test/data/data_pack_unittest/sample.pak")); + FILE_PATH_LITERAL("ui/base/test/data/data_pack_unittest/sample.pak")); DataPack pack; ASSERT_TRUE(pack.Load(data_path)); diff --git a/ui/base/resource/resource_bundle_posix.cc b/ui/base/resource/resource_bundle_posix.cc index 277974d..cce0a9e 100644 --- a/ui/base/resource/resource_bundle_posix.cc +++ b/ui/base/resource/resource_bundle_posix.cc @@ -4,13 +4,13 @@ #include "ui/base/resource/resource_bundle.h" -#include "app/l10n_util.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/string16.h" #include "base/string_piece.h" #include "base/synchronization/lock.h" #include "gfx/font.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/data_pack.h" namespace ui { diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc index 629265a..7c02db1 100644 --- a/ui/base/resource/resource_bundle_win.cc +++ b/ui/base/resource/resource_bundle_win.cc @@ -6,7 +6,6 @@ #include <atlbase.h> -#include "app/l10n_util.h" #include "base/debug/stack_trace.h" #include "base/file_util.h" #include "base/logging.h" @@ -17,8 +16,9 @@ #include "base/synchronization/lock.h" #include "base/win/windows_version.h" #include "gfx/font.h" -#include "ui/base/ui_base_paths.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/data_pack.h" +#include "ui/base/ui_base_paths.h" namespace ui { diff --git a/views/accelerator.cc b/views/accelerator.cc index c9d4f39..e9c9345 100644 --- a/views/accelerator.cc +++ b/views/accelerator.cc @@ -10,12 +10,12 @@ #include <gdk/gdk.h> #endif -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "grit/app_strings.h" +#include "ui/base/l10n/l10n_util.h" namespace views { diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc index 74e598e..01d62e7 100644 --- a/views/controls/button/button_dropdown.cc +++ b/views/controls/button/button_dropdown.cc @@ -4,11 +4,11 @@ #include "views/controls/button/button_dropdown.h" -#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "grit/app_strings.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/menu/view_menu_delegate.h" #include "views/widget/widget.h" diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index d7510c4..6564a23 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -4,12 +4,12 @@ #include "views/controls/button/menu_button.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "gfx/canvas.h" #include "grit/app_strings.h" #include "grit/app_resources.h" #include "ui/base/dragdrop/drag_drop_types.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/button/button.h" #include "views/controls/menu/view_menu_delegate.h" diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc index 44d101b..7a1bf05 100644 --- a/views/controls/label_unittest.cc +++ b/views/controls/label_unittest.cc @@ -2,11 +2,11 @@ // 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/i18n/rtl.h" #include "base/utf_string_conversions.h" #include "gfx/canvas.h" #include "testing/gtest/include/gtest/gtest.h" +#include "ui/base/l10n/l10n_util.h" #include "views/border.h" #include "views/controls/label.h" diff --git a/views/controls/listbox/native_listbox_win.cc b/views/controls/listbox/native_listbox_win.cc index a1a07b5..25a23d7 100644 --- a/views/controls/listbox/native_listbox_win.cc +++ b/views/controls/listbox/native_listbox_win.cc @@ -7,9 +7,9 @@ #include <commctrl.h> #include <windowsx.h> -#include "app/l10n_util_win.h" #include "base/utf_string_conversions.h" #include "gfx/font.h" +#include "ui/base/l10n/l10n_util_win.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/listbox/listbox.h" #include "views/widget/widget.h" diff --git a/views/controls/menu/menu_config_win.cc b/views/controls/menu/menu_config_win.cc index 3882cb4..fbbaa37 100644 --- a/views/controls/menu/menu_config_win.cc +++ b/views/controls/menu/menu_config_win.cc @@ -8,10 +8,10 @@ #include <uxtheme.h> #include <Vssym32.h> -#include "app/l10n_util_win.h" #include "base/logging.h" #include "base/win/win_util.h" #include "gfx/native_theme_win.h" +#include "ui/base/l10n/l10n_util_win.h" using gfx::NativeTheme; diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index 83b5bdc..dbc31a4 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -4,13 +4,13 @@ #include "views/controls/menu/menu_controller.h" -#include "app/l10n_util.h" #include "base/i18n/rtl.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "ui/base/dragdrop/os_exchange_data.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_scroll_view_container.h" #include "views/controls/menu/submenu_view.h" diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc index b5c1ced..bbbc9b7 100644 --- a/views/controls/menu/menu_item_view.cc +++ b/views/controls/menu/menu_item_view.cc @@ -4,10 +4,10 @@ #include "views/controls/menu/menu_item_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "gfx/canvas.h" #include "grit/app_strings.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/models/menu_model.h" #include "views/controls/button/text_button.h" #include "views/controls/button/menu_button.h" diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc index c99b91c..797489c 100644 --- a/views/controls/menu/menu_win.cc +++ b/views/controls/menu/menu_win.cc @@ -6,8 +6,6 @@ #include <string> -#include "app/l10n_util.h" -#include "app/l10n_util_win.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/string_util.h" @@ -15,6 +13,8 @@ #include "gfx/font.h" #include "gfx/rect.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_win.h" #include "ui/base/win/window_impl.h" #include "views/accelerator.h" diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc index 0cf6757..fab94b2 100644 --- a/views/controls/menu/native_menu_win.cc +++ b/views/controls/menu/native_menu_win.cc @@ -4,8 +4,6 @@ #include "views/controls/menu/native_menu_win.h" -#include "app/l10n_util.h" -#include "app/l10n_util_win.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/stl_util-inl.h" @@ -14,6 +12,8 @@ #include "gfx/font.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_win.h" #include "ui/base/win/hwnd_util.h" #include "views/accelerator.h" #include "views/controls/menu/menu_2.h" diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc index 01cbb15..3c303c2 100644 --- a/views/controls/native_control.cc +++ b/views/controls/native_control.cc @@ -10,12 +10,12 @@ #include <atlframe.h> #include <atlmisc.h> -#include "app/l10n_util_win.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "gfx/native_theme_win.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" +#include "ui/base/l10n/l10n_util_win.h" #include "ui/base/view_prop.h" #include "ui/base/win/hwnd_util.h" #include "views/background.h" diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc index af27b4c..b81b2ea 100644 --- a/views/controls/native_control_win.cc +++ b/views/controls/native_control_win.cc @@ -6,8 +6,8 @@ #include <windowsx.h> -#include "app/l10n_util_win.h" #include "base/logging.h" +#include "ui/base/l10n/l10n_util_win.h" #include "ui/base/view_prop.h" #include "ui/base/win/hwnd_util.h" #include "views/focus/focus_manager.h" diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc index 5a426e1..e7e32c8 100644 --- a/views/controls/scrollbar/bitmap_scroll_bar.cc +++ b/views/controls/scrollbar/bitmap_scroll_bar.cc @@ -8,7 +8,6 @@ #include "views/screen.h" #endif -#include "app/l10n_util.h" #include "base/callback.h" #include "base/compiler_specific.h" #include "base/message_loop.h" @@ -18,6 +17,7 @@ #include "grit/app_strings.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/keycodes/keyboard_codes.h" +#include "ui/base/l10n/l10n_util.h" #include "views/controls/menu/menu.h" #include "views/controls/scroll_view.h" #include "views/widget/widget.h" diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc index ed97ea2..cc81ba6 100644 --- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc +++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc @@ -6,12 +6,12 @@ #include <vssym32.h> -#include "app/l10n_util_win.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "gfx/canvas_skia.h" #include "gfx/font.h" #include "gfx/native_theme_win.h" +#include "ui/base/l10n/l10n_util_win.h" #include "ui/base/resource/resource_bundle.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/fill_layout.h" diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc index 86d4287..a0291bb 100644 --- a/views/controls/table/native_table_win.cc +++ b/views/controls/table/native_table_win.cc @@ -7,13 +7,13 @@ #include <commctrl.h> #include <windowsx.h> -#include "app/l10n_util.h" -#include "app/l10n_util_win.h" #include "base/logging.h" #include "gfx/canvas_skia.h" #include "gfx/favicon_size.h" #include "gfx/icon_util.h" #include "skia/ext/skia_utils_win.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_win.h" #include "ui/base/models/table_model.h" #include "ui/base/win/hwnd_util.h" #include "views/controls/table/table_view2.h" diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc index 940ca36..4bfd7749 100644 --- a/views/controls/table/table_view.cc +++ b/views/controls/table/table_view.cc @@ -9,8 +9,6 @@ #include <algorithm> -#include "app/l10n_util.h" -#include "app/l10n_util_win.h" #include "base/i18n/rtl.h" #include "base/string_util.h" #include "gfx/canvas_skia.h" @@ -20,6 +18,8 @@ #include "skia/ext/skia_utils_win.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkColorFilter.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_win.h" #include "ui/base/models/table_model.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc index 7c074d9..ecdb38f 100644 --- a/views/controls/textfield/native_textfield_win.cc +++ b/views/controls/textfield/native_textfield_win.cc @@ -6,8 +6,6 @@ #include <algorithm> -#include "app/l10n_util.h" -#include "app/l10n_util_win.h" #include "app/win/win_util.h" #include "base/i18n/rtl.h" #include "base/string_util.h" @@ -20,6 +18,8 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" +#include "ui/base/l10n/l10n_util.h" +#include "ui/base/l10n/l10n_util_win.h" #include "views/controls/label.h" #include "views/controls/menu/menu_win.h" #include "views/controls/menu/menu_2.h" diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc index 2f77449..3d81015 100644 --- a/views/controls/tree/tree_view.cc +++ b/views/controls/tree/tree_view.cc @@ -6,7 +6,6 @@ #include <vector> -#include "app/l10n_util_win.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/stl_util-inl.h" @@ -21,6 +20,7 @@ #include "ui/base/keycodes/keyboard_code_conversion_win.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/win/hwnd_util.h" +#include "ui/base/l10n/l10n_util_win.h" #include "views/focus/focus_manager.h" #include "views/widget/widget.h" diff --git a/views/widget/aero_tooltip_manager.cc b/views/widget/aero_tooltip_manager.cc index 138ff53..c704a58 100644 --- a/views/widget/aero_tooltip_manager.cc +++ b/views/widget/aero_tooltip_manager.cc @@ -8,9 +8,9 @@ #include <commctrl.h> #include <shlobj.h> -#include "app/l10n_util_win.h" #include "base/message_loop.h" #include "gfx/point.h" +#include "ui/base/l10n/l10n_util_win.h" namespace views { diff --git a/views/widget/tooltip_manager_win.cc b/views/widget/tooltip_manager_win.cc index 04e990b..0ea8187 100644 --- a/views/widget/tooltip_manager_win.cc +++ b/views/widget/tooltip_manager_win.cc @@ -7,12 +7,12 @@ #include <windowsx.h> #include <limits> -#include "app/l10n_util_win.h" #include "app/win/win_util.h" #include "base/i18n/rtl.h" #include "base/logging.h" #include "base/message_loop.h" #include "gfx/font.h" +#include "ui/base/l10n/l10n_util_win.h" #include "views/screen.h" #include "views/view.h" #include "views/widget/root_view.h" diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc index 3696441..1fd9dbd 100644 --- a/views/widget/widget_win.cc +++ b/views/widget/widget_win.cc @@ -4,13 +4,13 @@ #include "views/widget/widget_win.h" -#include "app/l10n_util_win.h" #include "app/win/win_util.h" #include "base/string_util.h" #include "gfx/canvas_skia.h" #include "gfx/native_theme_win.h" #include "gfx/path.h" #include "ui/base/keycodes/keyboard_code_conversion_win.h" +#include "ui/base/l10n/l10n_util_win.h" #include "ui/base/system_monitor/system_monitor.h" #include "ui/base/theme_provider.h" #include "ui/base/view_prop.h" diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc index 310f940..fe2fc30 100644 --- a/views/window/custom_frame_view.cc +++ b/views/window/custom_frame_view.cc @@ -4,13 +4,13 @@ #include "views/window/custom_frame_view.h" -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "gfx/canvas.h" #include "gfx/font.h" #include "gfx/path.h" #include "grit/app_resources.h" #include "grit/app_strings.h" +#include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "views/window/client_view.h" #include "views/window/window_shape.h" diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc index 3947949..d39acec 100644 --- a/views/window/dialog_client_view.cc +++ b/views/window/dialog_client_view.cc @@ -14,12 +14,12 @@ #include <algorithm> -#include "app/l10n_util.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "gfx/font.h" #include "grit/app_strings.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/native_button.h" #include "views/standard_layout.h" |