diff options
Diffstat (limited to 'chrome/browser/ui/views')
100 files changed, 102 insertions, 103 deletions
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" |