diff options
Diffstat (limited to 'chrome/browser/ui/gtk')
75 files changed, 75 insertions, 75 deletions
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; |