diff options
Diffstat (limited to 'chrome/browser/views')
59 files changed, 61 insertions, 63 deletions
diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc index ed79f59..38c658b 100644 --- a/chrome/browser/views/about_chrome_view.cc +++ b/chrome/browser/views/about_chrome_view.cc @@ -6,6 +6,7 @@ #include <commdlg.h> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_version_info.h" #include "base/string_util.h" @@ -17,7 +18,6 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/views/restart_message_box.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/chrome_constants.h" #include "chrome/installer/util/install_util.h" #include "chrome/views/controls/text_field.h" diff --git a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc index 2012a44..4fed441 100644 --- a/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc +++ b/chrome/browser/views/autocomplete/autocomplete_popup_contents_view.cc @@ -6,6 +6,7 @@ #include <dwmapi.h> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" #include "chrome/browser/autocomplete/autocomplete_popup_model.h" @@ -14,7 +15,6 @@ #include "chrome/common/gfx/color_utils.h" #include "chrome/common/gfx/insets.h" #include "chrome/common/gfx/path.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/win_util.h" #include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/blocked_popup_container.cc b/chrome/browser/views/blocked_popup_container.cc index 4fa0505..9220049 100644 --- a/chrome/browser/views/blocked_popup_container.cc +++ b/chrome/browser/views/blocked_popup_container.cc @@ -12,6 +12,7 @@ #include <math.h> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/extensions/extension_function_dispatcher.h" @@ -19,7 +20,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/views/background.h" diff --git a/chrome/browser/views/bookmark_bar_view.cc b/chrome/browser/views/bookmark_bar_view.cc index cc56194..6cc1554 100644 --- a/chrome/browser/views/bookmark_bar_view.cc +++ b/chrome/browser/views/bookmark_bar_view.cc @@ -6,6 +6,7 @@ #include <limits> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/base_drag_source.h" @@ -26,7 +27,6 @@ #include "chrome/browser/views/event_utils.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/page_transition_types.h" diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc index 86fe3ac..7bb4cce 100644 --- a/chrome/browser/views/bookmark_bubble_view.cc +++ b/chrome/browser/views/bookmark_bubble_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/bookmark_bubble_view.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/bookmarks/bookmark_editor.h" @@ -14,7 +15,6 @@ #include "chrome/browser/views/info_bubble.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/views/controls/button/native_button.h" #include "chrome/views/controls/text_field.h" diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc index ede739c..347ba5d 100644 --- a/chrome/browser/views/bookmark_editor_view.cc +++ b/chrome/browser/views/bookmark_editor_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/bookmark_editor_view.h" +#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/logging.h" #include "base/string_util.h" @@ -12,7 +13,6 @@ #include "chrome/browser/profile.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/background.h" #include "chrome/views/focus/focus_manager.h" #include "chrome/views/grid_layout.h" diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc index 33dd6d7..c339eba 100644 --- a/chrome/browser/views/bug_report_view.cc +++ b/chrome/browser/views/bug_report_view.cc @@ -7,6 +7,7 @@ #include <iostream> #include <fstream> +#include "app/l10n_util.h" #include "base/string_util.h" #include "chrome/browser/net/url_fetcher.h" #include "chrome/browser/profile.h" @@ -15,7 +16,6 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/controls/button/checkbox.h" diff --git a/chrome/browser/views/clear_browsing_data.cc b/chrome/browser/views/clear_browsing_data.cc index 0b00f6a..1d9070f 100644 --- a/chrome/browser/views/clear_browsing_data.cc +++ b/chrome/browser/views/clear_browsing_data.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/clear_browsing_data.h" +#include "app/l10n_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/checkbox.h" #include "chrome/views/controls/label.h" diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc index 5d5ae8f..fbe8264 100644 --- a/chrome/browser/views/constrained_window_impl.cc +++ b/chrome/browser/views/constrained_window_impl.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/constrained_window_impl.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/rect.h" #include "chrome/app/chrome_dll_resource.h" @@ -20,7 +21,6 @@ #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/path.h" #include "chrome/common/gfx/text_elider.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/constrained_window_impl_interactive_uitest.cc b/chrome/browser/views/constrained_window_impl_interactive_uitest.cc index 40a156a..7990d21 100644 --- a/chrome/browser/views/constrained_window_impl_interactive_uitest.cc +++ b/chrome/browser/views/constrained_window_impl_interactive_uitest.cc @@ -4,10 +4,10 @@ #include <string> +#include "app/l10n_util.h" #include "base/file_path.h" #include "chrome/browser/view_ids.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/l10n_util.h" #include "chrome/test/automation/automation_constants.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/constrained_window_proxy.h" diff --git a/chrome/browser/views/download_item_view.cc b/chrome/browser/views/download_item_view.cc index 3337c25..5653fda 100644 --- a/chrome/browser/views/download_item_view.cc +++ b/chrome/browser/views/download_item_view.cc @@ -6,6 +6,7 @@ #include <vector> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_path.h" #include "base/string_util.h" @@ -15,7 +16,6 @@ #include "chrome/browser/views/download_shelf_view.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/native_button.h" #include "chrome/views/controls/menu/menu.h" diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index 490eb42..8b52280 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "chrome/browser/download/download_item_model.h" @@ -14,7 +15,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/download_item_view.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/image_view.h" diff --git a/chrome/browser/views/edit_keyword_controller.cc b/chrome/browser/views/edit_keyword_controller.cc index 98295c9..c481d69 100644 --- a/chrome/browser/views/edit_keyword_controller.cc +++ b/chrome/browser/views/edit_keyword_controller.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/edit_keyword_controller.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/metrics/user_metrics.h" @@ -13,7 +14,6 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/keyword_editor_view.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/controls/label.h" #include "chrome/views/controls/image_view.h" #include "chrome/views/controls/table/table_view.h" diff --git a/chrome/browser/views/external_protocol_dialog.cc b/chrome/browser/views/external_protocol_dialog.cc index 2dca539..57c9bef 100644 --- a/chrome/browser/views/external_protocol_dialog.cc +++ b/chrome/browser/views/external_protocol_dialog.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/external_protocol_dialog.h" +#include "app/l10n_util.h" #include "base/histogram.h" #include "base/registry.h" #include "base/string_util.h" @@ -12,7 +13,6 @@ #include "chrome/browser/external_protocol_handler.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/message_box_flags.h" #include "chrome/views/controls/message_box_view.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/find_bar_view.cc b/chrome/browser/views/find_bar_view.cc index 2869cff1..7c7a26a 100644 --- a/chrome/browser/views/find_bar_view.cc +++ b/chrome/browser/views/find_bar_view.cc @@ -6,13 +6,13 @@ #include <algorithm> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/find_bar_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/find_bar_win.h" #include "chrome/browser/view_ids.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc index b1a153a..e487b5f 100644 --- a/chrome/browser/views/first_run_bubble.cc +++ b/chrome/browser/views/first_run_bubble.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/first_run_bubble.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/win_util.h" #include "chrome/browser/browser.h" @@ -13,7 +14,6 @@ #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/event.h" #include "chrome/views/controls/button/native_button.h" #include "chrome/views/controls/label.h" diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc index 6b5aa77..190a89a 100644 --- a/chrome/browser/views/first_run_customize_view.cc +++ b/chrome/browser/views/first_run_customize_view.cc @@ -4,12 +4,12 @@ #include "chrome/browser/views/first_run_customize_view.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/controls/button/checkbox.h" #include "chrome/views/controls/combo_box.h" #include "chrome/views/controls/image_view.h" diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc index bbfb4f9..e5e14a5 100644 --- a/chrome/browser/views/first_run_view.cc +++ b/chrome/browser/views/first_run_view.cc @@ -4,13 +4,13 @@ #include "chrome/browser/views/first_run_view.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/first_run.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/views/first_run_customize_view.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/controls/button/checkbox.h" #include "chrome/views/controls/image_view.h" #include "chrome/views/controls/label.h" diff --git a/chrome/browser/views/first_run_view_base.cc b/chrome/browser/views/first_run_view_base.cc index d55832d..cba6080 100644 --- a/chrome/browser/views/first_run_view_base.cc +++ b/chrome/browser/views/first_run_view_base.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/first_run_view_base.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/path_service.h" @@ -15,7 +16,6 @@ #include "chrome/browser/shell_integration.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/background.h" diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 5150aa9..ea92f19 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/frame/browser_view.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/file_version_info.h" @@ -47,7 +48,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/drag_drop_types.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/frame/opaque_browser_frame_view.cc b/chrome/browser/views/frame/opaque_browser_frame_view.cc index 8e4a7b6..23ea9ae 100644 --- a/chrome/browser/views/frame/opaque_browser_frame_view.cc +++ b/chrome/browser/views/frame/opaque_browser_frame_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/frame/opaque_browser_frame_view.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/views/frame/browser_frame.h" #include "chrome/browser/views/frame/browser_view.h" @@ -11,7 +12,6 @@ #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/path.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/browser/views/fullscreen_exit_bubble.cc b/chrome/browser/views/fullscreen_exit_bubble.cc index d1327cd..e490995 100644 --- a/chrome/browser/views/fullscreen_exit_bubble.cc +++ b/chrome/browser/views/fullscreen_exit_bubble.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/fullscreen_exit_bubble.h" +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/views/widget/root_view.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/go_button.cc b/chrome/browser/views/go_button.cc index 4c6de94..b0a817c 100644 --- a/chrome/browser/views/go_button.cc +++ b/chrome/browser/views/go_button.cc @@ -4,12 +4,12 @@ #include "chrome/browser/views/go_button.h" +#include "app/l10n_util.h" #include "base/message_loop.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser.h" #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/location_bar_view.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" //////////////////////////////////////////////////////////////////////////////// diff --git a/chrome/browser/views/importer_lock_view.cc b/chrome/browser/views/importer_lock_view.cc index 06aef04..e1224d4 100644 --- a/chrome/browser/views/importer_lock_view.cc +++ b/chrome/browser/views/importer_lock_view.cc @@ -4,9 +4,9 @@ #include "chrome/browser/views/importer_lock_view.h" +#include "app/l10n_util.h" #include "chrome/browser/importer/importer.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/controls/label.h" #include "chrome/views/window/window.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/views/importer_view.cc b/chrome/browser/views/importer_view.cc index f3a2d11..baa7387 100644 --- a/chrome/browser/views/importer_view.cc +++ b/chrome/browser/views/importer_view.cc @@ -4,9 +4,9 @@ #include "chrome/browser/views/importer_view.h" +#include "app/l10n_util.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/controls/button/checkbox.h" #include "chrome/views/controls/label.h" #include "chrome/views/grid_layout.h" diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc index cac8043..b2b41d0 100644 --- a/chrome/browser/views/importing_progress_view.cc +++ b/chrome/browser/views/importing_progress_view.cc @@ -4,8 +4,8 @@ #include "chrome/browser/views/importing_progress_view.h" +#include "app/l10n_util.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/grid_layout.h" #include "chrome/views/controls/label.h" #include "chrome/views/controls/throbber.h" diff --git a/chrome/browser/views/infobars/infobars.cc b/chrome/browser/views/infobars/infobars.cc index c4a0618..86ec619 100644 --- a/chrome/browser/views/infobars/infobars.cc +++ b/chrome/browser/views/infobars/infobars.cc @@ -4,13 +4,13 @@ #include "chrome/browser/views/infobars/infobars.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" #include "base/message_loop.h" #include "chrome/browser/views/event_utils.h" #include "chrome/browser/views/infobars/infobar_container.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/background.h" #include "chrome/views/controls/button/image_button.h" #include "chrome/views/controls/button/native_button.h" diff --git a/chrome/browser/views/jsmessage_box_dialog.cc b/chrome/browser/views/jsmessage_box_dialog.cc index 7deca87..3375af2 100644 --- a/chrome/browser/views/jsmessage_box_dialog.cc +++ b/chrome/browser/views/jsmessage_box_dialog.cc @@ -4,9 +4,9 @@ #include "chrome/browser/views/jsmessage_box_dialog.h" +#include "app/l10n_util.h" #include "chrome/browser/app_modal_dialog.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/message_box_flags.h" #include "chrome/views/controls/message_box_view.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/keyword_editor_view.cc b/chrome/browser/views/keyword_editor_view.cc index 7ea7771..f650ba2 100644 --- a/chrome/browser/views/keyword_editor_view.cc +++ b/chrome/browser/views/keyword_editor_view.cc @@ -6,6 +6,7 @@ #include <vector> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/png_decoder.h" #include "base/stl_util-inl.h" @@ -17,7 +18,6 @@ #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/browser/views/edit_keyword_controller.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/background.h" diff --git a/chrome/browser/views/location_bar_view.cc b/chrome/browser/views/location_bar_view.cc index 9ddeea3..41d0953 100644 --- a/chrome/browser/views/location_bar_view.cc +++ b/chrome/browser/views/location_bar_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/location_bar_view.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/path_service.h" #include "base/string_util.h" @@ -24,7 +25,6 @@ #include "chrome/browser/views/info_bubble.h" #include "chrome/browser/views/first_run_bubble.h" #include "chrome/browser/views/page_info_window.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/win_util.h" #include "chrome/views/background.h" diff --git a/chrome/browser/views/login_view.cc b/chrome/browser/views/login_view.cc index 47626cf..cef889a 100644 --- a/chrome/browser/views/login_view.cc +++ b/chrome/browser/views/login_view.cc @@ -6,9 +6,9 @@ #include "chrome/browser/views/login_view.h" +#include "app/l10n_util.h" #include "base/message_loop.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/grid_layout.h" #include "chrome/views/controls/label.h" #include "chrome/views/controls/text_field.h" diff --git a/chrome/browser/views/new_profile_dialog.cc b/chrome/browser/views/new_profile_dialog.cc index cf9551d1..b50424a 100644 --- a/chrome/browser/views/new_profile_dialog.cc +++ b/chrome/browser/views/new_profile_dialog.cc @@ -6,10 +6,10 @@ #include <string> +#include "app/l10n_util.h" #include "base/logging.h" #include "base/file_util.h" #include "chrome/browser/user_data_manager.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/message_box_flags.h" #include "chrome/views/controls/message_box_view.h" #include "chrome/views/controls/text_field.h" diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc index 20d8616..a29b109 100644 --- a/chrome/browser/views/options/advanced_page_view.cc +++ b/chrome/browser/views/options/advanced_page_view.cc @@ -4,13 +4,13 @@ #include "chrome/browser/views/options/advanced_page_view.h" +#include "app/l10n_util.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/views/options/advanced_contents_view.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/message_box_flags.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index e0cc572..095ea36 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -9,6 +9,7 @@ #include "chrome/browser/views/options/content_page_view.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/gfx/native_theme.h" @@ -19,7 +20,6 @@ #include "chrome/browser/views/options/passwords_exceptions_window_view.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/controls/button/radio_button.h" diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index 6d66800..f428ff1 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -6,6 +6,7 @@ #include "chrome/browser/views/options/cookies_view.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/time_format.h" @@ -13,7 +14,6 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/win_util.h" #include "chrome/views/border.h" #include "chrome/views/grid_layout.h" diff --git a/chrome/browser/views/options/exceptions_page_view.cc b/chrome/browser/views/options/exceptions_page_view.cc index b4c580c..65c38f9 100644 --- a/chrome/browser/views/options/exceptions_page_view.cc +++ b/chrome/browser/views/options/exceptions_page_view.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/options/exceptions_page_view.h" +#include "app/l10n_util.h" #include "base/string_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/background.h" diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc index 36fbaf2..6219f87 100644 --- a/chrome/browser/views/options/fonts_languages_window_view.cc +++ b/chrome/browser/views/options/fonts_languages_window_view.cc @@ -4,12 +4,12 @@ #include "chrome/browser/views/options/fonts_languages_window_view.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/options/fonts_page_view.h" #include "chrome/browser/views/options/languages_page_view.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index f7be657..554acb3 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -11,6 +11,7 @@ #include <vector> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/gfx/native_theme.h" @@ -21,7 +22,6 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/controls/button/native_button.h" diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index 229f93a..bf7c4a7 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/options/general_page_view.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/png_decoder.h" #include "base/message_loop.h" @@ -25,7 +26,6 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/browser/dom_ui/new_tab_ui.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/views/options/language_combobox_model.cc b/chrome/browser/views/options/language_combobox_model.cc index 3411a4d..7186032 100644 --- a/chrome/browser/views/options/language_combobox_model.cc +++ b/chrome/browser/views/options/language_combobox_model.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/options/language_combobox_model.h" +#include "app/l10n_util.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/metrics/user_metrics.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" #include "unicode/uloc.h" diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index 42e5b89..c960f13 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -8,6 +8,7 @@ #include "chrome/browser/views/options/languages_page_view.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/string_util.h" @@ -21,7 +22,6 @@ #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/controls/button/radio_button.h" diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc index 2302eec..a6071dc 100644 --- a/chrome/browser/views/options/options_group_view.cc +++ b/chrome/browser/views/options/options_group_view.cc @@ -7,12 +7,12 @@ #include "chrome/browser/views/options/options_group_view.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/grid_layout.h" #include "chrome/views/controls/label.h" #include "chrome/views/controls/separator.h" diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc index 8b40893..15f4181 100644 --- a/chrome/browser/views/options/options_window_view.cc +++ b/chrome/browser/views/options/options_window_view.cc @@ -4,6 +4,7 @@ #include "chrome/browser/options_window.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" @@ -11,7 +12,6 @@ #include "chrome/browser/views/options/content_page_view.h" #include "chrome/browser/views/options/general_page_view.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #ifdef CHROME_PERSONALIZATION diff --git a/chrome/browser/views/options/passwords_exceptions_window_view.cc b/chrome/browser/views/options/passwords_exceptions_window_view.cc index 4ea100f..587548a 100644 --- a/chrome/browser/views/options/passwords_exceptions_window_view.cc +++ b/chrome/browser/views/options/passwords_exceptions_window_view.cc @@ -4,9 +4,9 @@ #include "chrome/browser/views/options/passwords_exceptions_window_view.h" +#include "app/l10n_util.h" #include "chrome/browser/views/options/passwords_page_view.h" #include "chrome/browser/views/options/exceptions_page_view.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" // static diff --git a/chrome/browser/views/options/passwords_page_view.cc b/chrome/browser/views/options/passwords_page_view.cc index 7325dd4..04c13f4 100644 --- a/chrome/browser/views/options/passwords_page_view.cc +++ b/chrome/browser/views/options/passwords_page_view.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/options/passwords_page_view.h" +#include "app/l10n_util.h" #include "base/string_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/background.h" diff --git a/chrome/browser/views/page_info_window.cc b/chrome/browser/views/page_info_window.cc index f1bd9e4..059ec52 100644 --- a/chrome/browser/views/page_info_window.cc +++ b/chrome/browser/views/page_info_window.cc @@ -7,6 +7,7 @@ #include <cryptuiapi.h> #pragma comment(lib, "cryptui.lib") +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/time_format.h" @@ -16,7 +17,6 @@ #include "chrome/browser/profile.h" #include "chrome/browser/ssl/ssl_manager.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/views/repost_form_warning_view.cc b/chrome/browser/views/repost_form_warning_view.cc index 97e33fd..a1bd302 100644 --- a/chrome/browser/views/repost_form_warning_view.cc +++ b/chrome/browser/views/repost_form_warning_view.cc @@ -4,9 +4,9 @@ #include "chrome/browser/views/repost_form_warning_view.h" +#include "app/l10n_util.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/tab_contents/navigation_controller.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/message_box_flags.h" #include "chrome/common/notification_service.h" #include "chrome/views/controls/message_box_view.h" diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc index e9728cb..3624f5c 100644 --- a/chrome/browser/views/restart_message_box.cc +++ b/chrome/browser/views/restart_message_box.cc @@ -4,7 +4,7 @@ #include "chrome/browser/views/restart_message_box.h" -#include "chrome/common/l10n_util.h" +#include "app/l10n_util.h" #include "chrome/common/message_box_flags.h" #include "chrome/views/controls/message_box_view.h" #include "chrome/views/window/window.h" diff --git a/chrome/browser/views/sad_tab_view.cc b/chrome/browser/views/sad_tab_view.cc index 0ed2454..1653894 100644 --- a/chrome/browser/views/sad_tab_view.cc +++ b/chrome/browser/views/sad_tab_view.cc @@ -4,10 +4,10 @@ #include "chrome/browser/views/sad_tab_view.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/size.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/skia_utils.h" diff --git a/chrome/browser/views/select_profile_dialog.cc b/chrome/browser/views/select_profile_dialog.cc index 3a5c6d2..2a2af8b 100644 --- a/chrome/browser/views/select_profile_dialog.cc +++ b/chrome/browser/views/select_profile_dialog.cc @@ -6,12 +6,12 @@ #include <string> +#include "app/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" #include "chrome/browser/user_data_manager.h" #include "chrome/browser/views/new_profile_dialog.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/controls/combo_box.h" #include "chrome/views/controls/label.h" #include "chrome/views/controls/message_box_view.h" diff --git a/chrome/browser/views/shelf_item_dialog.cc b/chrome/browser/views/shelf_item_dialog.cc index 720e255..fdfae82 100644 --- a/chrome/browser/views/shelf_item_dialog.cc +++ b/chrome/browser/views/shelf_item_dialog.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/shelf_item_dialog.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/png_decoder.h" #include "base/stl_util-inl.h" @@ -13,7 +14,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/text_elider.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/views/background.h" diff --git a/chrome/browser/views/shell_dialogs_win.cc b/chrome/browser/views/shell_dialogs_win.cc index 24324d9..35879b9 100644 --- a/chrome/browser/views/shell_dialogs_win.cc +++ b/chrome/browser/views/shell_dialogs_win.cc @@ -12,13 +12,13 @@ #include <algorithm> #include <set> +#include "app/l10n_util.h" #include "base/file_util.h" #include "base/registry.h" #include "base/string_util.h" #include "base/thread.h" #include "chrome/browser/browser_process.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/win_util.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/views/status_bubble_views.cc b/chrome/browser/views/status_bubble_views.cc index 002cf7f..cf8a18a 100644 --- a/chrome/browser/views/status_bubble_views.cc +++ b/chrome/browser/views/status_bubble_views.cc @@ -6,13 +6,13 @@ #include <algorithm> +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "app/animation.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/text_elider.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/views/controls/label.h" #include "chrome/views/widget/root_view.h" #include "chrome/views/widget/widget_win.h" diff --git a/chrome/browser/views/tabs/tab.cc b/chrome/browser/views/tabs/tab.cc index e79b77c..ee2638f 100644 --- a/chrome/browser/views/tabs/tab.cc +++ b/chrome/browser/views/tabs/tab.cc @@ -4,11 +4,11 @@ #include "chrome/browser/views/tabs/tab.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/size.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/controls/menu/chrome_menu.h" #include "chrome/views/widget/tooltip_manager.h" #include "chrome/views/widget/widget.h" diff --git a/chrome/browser/views/tabs/tab_renderer.cc b/chrome/browser/views/tabs/tab_renderer.cc index e9608bd..7f1d805 100644 --- a/chrome/browser/views/tabs/tab_renderer.cc +++ b/chrome/browser/views/tabs/tab_renderer.cc @@ -6,6 +6,7 @@ #include "chrome/browser/views/tabs/tab_renderer.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" @@ -13,7 +14,6 @@ #include "chrome/browser/tabs/tab_strip_model.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/win_util.h" #include "chrome/views/widget/widget.h" #include "chrome/views/window/non_client_view.h" diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc index 9d301f0..0d314ab 100644 --- a/chrome/browser/views/tabs/tab_strip.cc +++ b/chrome/browser/views/tabs/tab_strip.cc @@ -4,6 +4,7 @@ #include "chrome/browser/views/tabs/tab_strip.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" #include "base/gfx/size.h" @@ -19,7 +20,6 @@ #include "chrome/common/drag_drop_types.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/path.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc index ef6d5e2..d17fa46 100644 --- a/chrome/browser/views/toolbar_view.cc +++ b/chrome/browser/views/toolbar_view.cc @@ -6,6 +6,7 @@ #include <string> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/logging.h" @@ -33,7 +34,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/drag_drop_types.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/views/uninstall_dialog.cc b/chrome/browser/views/uninstall_dialog.cc index 51e7023..59ff2d5 100644 --- a/chrome/browser/views/uninstall_dialog.cc +++ b/chrome/browser/views/uninstall_dialog.cc @@ -4,8 +4,8 @@ #include "chrome/browser/views/uninstall_dialog.h" +#include "app/l10n_util.h" #include "base/message_loop.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/result_codes.h" #include "chrome/common/message_box_flags.h" #include "chrome/views/controls/message_box_view.h" @@ -59,5 +59,3 @@ UninstallDialog::UninstallDialog(int& user_selection) UninstallDialog::~UninstallDialog() { MessageLoop::current()->Quit(); } - - diff --git a/chrome/browser/views/user_data_dir_dialog.cc b/chrome/browser/views/user_data_dir_dialog.cc index 79bcd4e..c670ce8 100644 --- a/chrome/browser/views/user_data_dir_dialog.cc +++ b/chrome/browser/views/user_data_dir_dialog.cc @@ -2,9 +2,9 @@ // 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 "chrome/browser/views/user_data_dir_dialog.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/message_box_flags.h" #include "chrome/views/controls/message_box_view.h" #include "chrome/views/widget/widget.h" |