diff options
213 files changed, 274 insertions, 267 deletions
@@ -1,8 +1,17 @@ -include_rules = [ - "+net", - # TODO(beng): Sever this link once we have extracted all deps from - # chrome/common. - "+chrome/common", - # TODO(beng): Sever this link after glen fixes it. - "+chrome/browser/extensions/extension.h", -] +include_rules = [
+ "+grit",
+ "+net",
+ # TODO(beng): Sever these links once we have extracted all deps from
+ # chrome/common.
+ "+chrome/common/chrome_paths.h",
+ "+chrome/common/chrome_switches.h",
+ "+chrome/common/gfx/chrome_canvas.h",
+ "+chrome/common/gfx/chrome_font.h",
+ "+chrome/common/gtk_util.h",
+
+ # TODO(beng): l10n_util_unittest.cc:
+ "+chrome/test/data/resource.h",
+
+ # TODO(beng): resource_bundle.cc: Sever this link after glen fixes it.
+ "+chrome/browser/extensions/extension.h",
+]
diff --git a/app/app.vcproj b/app/app.vcproj index 02d76cd..c4c489c 100644 --- a/app/app.vcproj +++ b/app/app.vcproj @@ -130,6 +130,22 @@ >
</File>
<File
+ RelativePath=".\l10n_util.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\l10n_util.h"
+ >
+ </File>
+ <File
+ RelativePath=".\l10n_util_win.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\l10n_util_win.h"
+ >
+ </File>
+ <File
RelativePath=".\resource_bundle.cc"
>
</File>
diff --git a/chrome/common/l10n_util.cc b/app/l10n_util.cc index 6e6849c..55ce530 100644 --- a/chrome/common/l10n_util.cc +++ b/app/l10n_util.cc @@ -4,7 +4,7 @@ #include "build/build_config.h" -#include "chrome/common/l10n_util.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" diff --git a/chrome/common/l10n_util.h b/app/l10n_util.h index 828112c..aafd658 100644 --- a/chrome/common/l10n_util.h +++ b/app/l10n_util.h @@ -5,8 +5,8 @@ // This file contains utility functions for dealing with localized // content. -#ifndef CHROME_COMMON_L10N_UTIL_H_ -#define CHROME_COMMON_L10N_UTIL_H_ +#ifndef APP_L10N_UTIL_H_ +#define APP_L10N_UTIL_H_ #include "build/build_config.h" @@ -367,4 +367,4 @@ class BiDiLineIterator { } -#endif // CHROME_COMMON_L10N_UTIL_H_ +#endif // APP_L10N_UTIL_H_ diff --git a/chrome/common/l10n_util_posix.cc b/app/l10n_util_posix.cc index a0c8ae1..c6797c2 100644 --- a/chrome/common/l10n_util_posix.cc +++ b/app/l10n_util_posix.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/l10n_util.h" +#include "app/l10n_util.h" namespace l10n_util { diff --git a/chrome/common/l10n_util_unittest.cc b/app/l10n_util_unittest.cc index 5fbff86..0ca5608 100644 --- a/chrome/common/l10n_util_unittest.cc +++ b/app/l10n_util_unittest.cc @@ -4,6 +4,7 @@ #include "build/build_config.h" +#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/file_util.h" #include "base/path_service.h" @@ -13,7 +14,6 @@ #include "base/win_util.h" #endif #include "chrome/common/chrome_paths.h" -#include "chrome/common/l10n_util.h" #if !defined(OS_MACOSX) #include "chrome/test/data/resource.h" #endif diff --git a/chrome/common/l10n_util_win.cc b/app/l10n_util_win.cc index e17a78b..cf12d4d 100644 --- a/chrome/common/l10n_util_win.cc +++ b/app/l10n_util_win.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include <algorithm> #include <windowsx.h> @@ -91,7 +91,7 @@ bool NeedOverrideDefaultUIFont(std::wstring* override_font_family, return false; if (override_font_family && font_size_scaler) { override_font_family->swap(ui_font_family); - *font_size_scaler = scaler100 / 100.0; + *font_size_scaler = scaler100 / 100.0; } return true; } diff --git a/chrome/common/l10n_util_win.h b/app/l10n_util_win.h index acfb209..f53cd63 100644 --- a/chrome/common/l10n_util_win.h +++ b/app/l10n_util_win.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_COMMON_L10N_UTIL_WIN_H_ -#define CHROME_COMMON_L10N_UTIL_WIN_H_ +#ifndef APP_L10N_UTIL_WIN_H_ +#define APP_L10N_UTIL_WIN_H_ #include <windows.h> @@ -28,7 +28,7 @@ void HWNDSetRTLLayout(HWND hwnd); // See http://blogs.msdn.com/oldnewthing/archive/2005/09/15/467598.aspx // and http://blogs.msdn.com/oldnewthing/archive/2006/06/26/647365.aspx -// as to why we need these three functions. +// as to why we need these three functions. // Return true if the default font (we get from Windows) is not suitable // to use in the UI of the current UI (e.g. Malayalam, Bengali). If @@ -48,4 +48,4 @@ void AdjustUIFontForWindow(HWND hwnd); } // namespace l10n_util -#endif // CHROME_COMMON_L10N_UTIL_WIN_H_ +#endif // APP_L10N_UTIL_WIN_H_ diff --git a/app/resource_bundle_linux.cc b/app/resource_bundle_linux.cc index 9c866b2..8f0660d 100644 --- a/app/resource_bundle_linux.cc +++ b/app/resource_bundle_linux.cc @@ -6,6 +6,7 @@ #include <gtk/gtk.h> +#include "app/l10n_util.h" #include "base/base_paths.h" #include "base/data_pack.h" #include "base/file_path.h" @@ -18,7 +19,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gtk_util.h" -#include "chrome/common/l10n_util.h" #include "SkBitmap.h" namespace { diff --git a/app/resource_bundle_win.cc b/app/resource_bundle_win.cc index cf21084..4ed32c4 100644 --- a/app/resource_bundle_win.cc +++ b/app/resource_bundle_win.cc @@ -6,6 +6,7 @@ #include <atlbase.h> +#include "app/l10n_util.h" #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" @@ -14,7 +15,6 @@ #include "base/win_util.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" namespace { diff --git a/chrome/browser/alternate_nav_url_fetcher.cc b/chrome/browser/alternate_nav_url_fetcher.cc index 452c4c6..65a98b3 100644 --- a/chrome/browser/alternate_nav_url_fetcher.cc +++ b/chrome/browser/alternate_nav_url_fetcher.cc @@ -4,11 +4,11 @@ #include "chrome/browser/alternate_nav_url_fetcher.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/app_modal_dialog_gtk.cc b/chrome/browser/app_modal_dialog_gtk.cc index 203ae39..99ea2f5 100644 --- a/chrome/browser/app_modal_dialog_gtk.cc +++ b/chrome/browser/app_modal_dialog_gtk.cc @@ -6,11 +6,11 @@ #include <gtk/gtk.h> +#include "app/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_contents_view.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/message_box_flags.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/app_modal_dialog_mac.mm b/chrome/browser/app_modal_dialog_mac.mm index 77823824..6df038f 100644 --- a/chrome/browser/app_modal_dialog_mac.mm +++ b/chrome/browser/app_modal_dialog_mac.mm @@ -6,8 +6,8 @@ #import <Cocoa/Cocoa.h> +#include "app/l10n_util.h" #include "base/sys_string_conversions.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/message_box_flags.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/autocomplete/autocomplete.cc b/chrome/browser/autocomplete/autocomplete.cc index ce5e196..decdd78 100644 --- a/chrome/browser/autocomplete/autocomplete.cc +++ b/chrome/browser/autocomplete/autocomplete.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/string_util.h" #include "chrome/browser/autocomplete/history_url_provider.h" @@ -18,7 +19,6 @@ #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.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/autocomplete/autocomplete_accessibility.cc b/chrome/browser/autocomplete/autocomplete_accessibility.cc index 927467f..8fefe91 100644 --- a/chrome/browser/autocomplete/autocomplete_accessibility.cc +++ b/chrome/browser/autocomplete/autocomplete_accessibility.cc @@ -4,9 +4,9 @@ #include "chrome/browser/autocomplete/autocomplete_accessibility.h" +#include "app/l10n_util.h" #include "chrome/browser/autocomplete/autocomplete_edit.h" #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/accessibility/view_accessibility_wrapper.h" #include "chrome/views/view.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc index 8649df7..53fd027 100644 --- a/chrome/browser/autocomplete/autocomplete_edit_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_edit_view_win.cc @@ -6,6 +6,8 @@ #include <locale> +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "base/base_drag_source.h" #include "base/base_drop_target.h" #include "base/basictypes.h" @@ -32,8 +34,6 @@ #include "chrome/browser/views/location_bar_view.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/utils.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/common/notification_service.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc index 82988718..9bf4cb9 100644 --- a/chrome/browser/autocomplete/autocomplete_popup_view_win.cc +++ b/chrome/browser/autocomplete/autocomplete_popup_view_win.cc @@ -11,6 +11,7 @@ #include <atlmisc.h> #include <cmath> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/string_util.h" @@ -28,7 +29,6 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/views/view.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/autocomplete/keyword_provider.cc b/chrome/browser/autocomplete/keyword_provider.cc index b4d5e50..1ff05ad 100644 --- a/chrome/browser/autocomplete/keyword_provider.cc +++ b/chrome/browser/autocomplete/keyword_provider.cc @@ -7,11 +7,11 @@ #include <algorithm> #include <vector> +#include "app/l10n_util.h" #include "base/string_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/net_util.h" diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc index b028587..a4c3134 100644 --- a/chrome/browser/autocomplete/search_provider.cc +++ b/chrome/browser/autocomplete/search_provider.cc @@ -4,6 +4,7 @@ #include "chrome/browser/autocomplete/search_provider.h" +#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/string_util.h" #include "chrome/browser/autocomplete/keyword_provider.h" @@ -13,7 +14,6 @@ #include "chrome/browser/profile.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/json_value_serializer.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/back_forward_menu_model.cc b/chrome/browser/back_forward_menu_model.cc index 83b8e53..73df778 100644 --- a/chrome/browser/back_forward_menu_model.cc +++ b/chrome/browser/back_forward_menu_model.cc @@ -6,12 +6,12 @@ #include "chrome/browser/back_forward_menu_model.h" +#include "app/l10n_util.h" #include "chrome/browser/browser.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" #include "net/base/registry_controlled_domain.h" diff --git a/chrome/browser/bookmarks/bookmark_codec.cc b/chrome/browser/bookmarks/bookmark_codec.cc index da8a999..731de81 100644 --- a/chrome/browser/bookmarks/bookmark_codec.cc +++ b/chrome/browser/bookmarks/bookmark_codec.cc @@ -4,10 +4,10 @@ #include "chrome/browser/bookmarks/bookmark_codec.h" +#include "app/l10n_util.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/bookmarks/bookmark_model.h" -#include "chrome/common/l10n_util.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" @@ -313,4 +313,3 @@ void BookmarkCodec::FinalizeChecksum() { MD5Final(&digest, &md5_context_); computed_checksum_ = MD5DigestToBase16(digest); } - diff --git a/chrome/browser/bookmarks/bookmark_context_menu.cc b/chrome/browser/bookmarks/bookmark_context_menu.cc index 039cd83..00935b4 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu.cc @@ -4,6 +4,7 @@ #include "chrome/browser/bookmarks/bookmark_context_menu.h" +#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "chrome/browser/bookmarks/bookmark_editor.h" #include "chrome/browser/bookmarks/bookmark_model.h" @@ -14,7 +15,6 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/page_navigator.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/bookmarks/bookmark_context_menu_gtk.cc b/chrome/browser/bookmarks/bookmark_context_menu_gtk.cc index e984ee0..cf616d9 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_gtk.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_gtk.cc @@ -4,7 +4,7 @@ #include "chrome/browser/bookmarks/bookmark_context_menu.h" -#include "chrome/common/l10n_util.h" +#include "app/l10n_util.h" void BookmarkContextMenu::PopupAsContext(guint32 event_time) { menu_->PopupAsContext(event_time); diff --git a/chrome/browser/bookmarks/bookmark_context_menu_win.cc b/chrome/browser/bookmarks/bookmark_context_menu_win.cc index 705a55f..9baf3b9 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_win.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_win.cc @@ -4,7 +4,7 @@ #include "chrome/browser/bookmarks/bookmark_context_menu.h" -#include "chrome/common/l10n_util.h" +#include "app/l10n_util.h" void BookmarkContextMenu::RunMenuAt(int x, int y) { if (!model_->IsLoaded()) { diff --git a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc index d86d52f..3f1530f 100644 --- a/chrome/browser/bookmarks/bookmark_folder_tree_model.cc +++ b/chrome/browser/bookmarks/bookmark_folder_tree_model.cc @@ -4,8 +4,8 @@ #include "chrome/browser/bookmarks/bookmark_folder_tree_model.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/bookmarks/bookmark_html_writer.cc b/chrome/browser/bookmarks/bookmark_html_writer.cc index de4c4ad..00498c4 100644 --- a/chrome/browser/bookmarks/bookmark_html_writer.cc +++ b/chrome/browser/bookmarks/bookmark_html_writer.cc @@ -4,6 +4,7 @@ #include "chrome/browser/bookmarks/bookmark_html_writer.h" +#include "app/l10n_util.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/message_loop.h" @@ -15,7 +16,6 @@ #include "chrome/browser/bookmarks/bookmark_codec.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/history/history_types.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" #include "net/base/escape.h" #include "net/base/file_stream.h" diff --git a/chrome/browser/bookmarks/bookmark_menu_controller.cc b/chrome/browser/bookmarks/bookmark_menu_controller.cc index 0fcaa98d6..4376c92 100644 --- a/chrome/browser/bookmarks/bookmark_menu_controller.cc +++ b/chrome/browser/bookmarks/bookmark_menu_controller.cc @@ -4,6 +4,7 @@ #include "chrome/browser/bookmarks/bookmark_menu_controller.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/bookmarks/bookmark_drag_data.h" #include "chrome/browser/bookmarks/bookmark_utils.h" @@ -12,7 +13,6 @@ #include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/views/event_utils.h" #include "chrome/common/os_exchange_data.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/page_transition_types.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/bookmarks/bookmark_model.cc b/chrome/browser/bookmarks/bookmark_model.cc index f0eb9b8..e944419 100644 --- a/chrome/browser/bookmarks/bookmark_model.cc +++ b/chrome/browser/bookmarks/bookmark_model.cc @@ -4,6 +4,7 @@ #include "chrome/browser/bookmarks/bookmark_model.h" +#include "app/l10n_util.h" #include "base/gfx/png_decoder.h" #include "base/scoped_vector.h" #include "build/build_config.h" @@ -11,7 +12,6 @@ #include "chrome/browser/bookmarks/bookmark_storage.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/bookmarks/bookmark_table_model.cc b/chrome/browser/bookmarks/bookmark_table_model.cc index 24e0d53..15550b9 100644 --- a/chrome/browser/bookmarks/bookmark_table_model.cc +++ b/chrome/browser/bookmarks/bookmark_table_model.cc @@ -6,11 +6,11 @@ #include <limits> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/time_format.h" #include "chrome/browser/bookmarks/bookmark_utils.h" -#include "chrome/common/l10n_util.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 6832778..80a9fbd 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -4,6 +4,7 @@ #include "chrome/browser/bookmarks/bookmark_utils.h" +#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/string_util.h" #include "base/time.h" @@ -16,7 +17,6 @@ #include "chrome/browser/tab_contents/page_navigator.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/drag_drop_types.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/browser.cc b/chrome/browser/browser.cc index 646076e..efee083 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -4,6 +4,7 @@ #include "chrome/browser/browser.h" +#include "app/l10n_util.h" #include "base/command_line.h" #include "base/idle_timer.h" #include "base/logging.h" @@ -35,7 +36,6 @@ #include "chrome/browser/tab_contents/tab_contents_view.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/page_transition_types.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/browser_about_handler.cc b/chrome/browser/browser_about_handler.cc index 9321958..662671e 100644 --- a/chrome/browser/browser_about_handler.cc +++ b/chrome/browser/browser_about_handler.cc @@ -7,6 +7,7 @@ #include <string> #include <vector> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_version_info.h" #include "base/histogram.h" @@ -24,7 +25,6 @@ #include "chrome/browser/renderer_host/render_process_host.h" #include "chrome/browser/renderer_host/render_view_host.h" #include "chrome/common/jstemplate_builder.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/common/render_messages.h" diff --git a/chrome/browser/browser_init.cc b/chrome/browser/browser_init.cc index 00d265d..4e213eb 100644 --- a/chrome/browser/browser_init.cc +++ b/chrome/browser/browser_init.cc @@ -4,6 +4,7 @@ #include "chrome/browser/browser_init.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/command_line.h" @@ -35,7 +36,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.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/common/result_codes.h" diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index a40138a..defd7b7 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/field_trial.h" @@ -41,7 +42,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/jstemplate_builder.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/main_function_params.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/browser_main_win.cc b/chrome/browser/browser_main_win.cc index d64aa66..2c6e77f 100644 --- a/chrome/browser/browser_main_win.cc +++ b/chrome/browser/browser_main_win.cc @@ -9,6 +9,7 @@ #include "chrome/browser/browser_main_win.h" +#include "app/l10n_util.h" #include "base/command_line.h" #include "base/path_service.h" #include "base/win_util.h" @@ -17,7 +18,6 @@ #include "chrome/browser/views/uninstall_dialog.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/env_vars.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/message_box_flags.h" #include "chrome/common/result_codes.h" #include "chrome/installer/util/helper.h" diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc index 0c3e9ea..7a09320 100644 --- a/chrome/browser/browser_process_impl.cc +++ b/chrome/browser/browser_process_impl.cc @@ -4,6 +4,7 @@ #include "chrome/browser/browser_process_impl.h" +#include "app/l10n_util.h" #include "base/clipboard.h" #include "base/command_line.h" #include "base/path_service.h" @@ -25,7 +26,6 @@ #include "chrome/browser/safe_browsing/safe_browsing_service.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.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/browser_uitest.cc b/chrome/browser/browser_uitest.cc index 90110fb..4feb635 100644 --- a/chrome/browser/browser_uitest.cc +++ b/chrome/browser/browser_uitest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "app/l10n_util.h" #include "base/file_path.h" #include "base/gfx/native_widget_types.h" #include "base/string_util.h" @@ -9,7 +10,6 @@ #include "base/values.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/platform_util.h" #include "chrome/common/pref_names.h" #include "chrome/test/automation/browser_proxy.h" diff --git a/chrome/browser/character_encoding.cc b/chrome/browser/character_encoding.cc index 035d6e1..da65159 100644 --- a/chrome/browser/character_encoding.cc +++ b/chrome/browser/character_encoding.cc @@ -7,12 +7,12 @@ #include <map> #include <set> +#include "app/l10n_util.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/string_tokenizer.h" #include "base/string_util.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" #include "unicode/ucnv.h" diff --git a/chrome/browser/cocoa/find_bar_cocoa_controller.mm b/chrome/browser/cocoa/find_bar_cocoa_controller.mm index bdd0937..43123bf 100644 --- a/chrome/browser/cocoa/find_bar_cocoa_controller.mm +++ b/chrome/browser/cocoa/find_bar_cocoa_controller.mm @@ -4,6 +4,7 @@ #import <Cocoa/Cocoa.h> +#include "app/l10n_util.h" #include "base/mac_util.h" #include "base/sys_string_conversions.h" #include "grit/generated_resources.h" @@ -13,7 +14,6 @@ #import "chrome/browser/cocoa/find_bar_bridge.h" #import "chrome/browser/cocoa/tab_strip_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" @implementation FindBarCocoaController diff --git a/chrome/browser/cocoa/sad_tab_view.mm b/chrome/browser/cocoa/sad_tab_view.mm index c74f297..78d4793 100644 --- a/chrome/browser/cocoa/sad_tab_view.mm +++ b/chrome/browser/cocoa/sad_tab_view.mm @@ -4,8 +4,8 @@ #include "chrome/browser/cocoa/sad_tab_view.h" +#include "app/l10n_util.h" #include "base/sys_string_conversions.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" static const int kSadTabOffset = -64; diff --git a/chrome/browser/cocoa/tab_strip_controller.mm b/chrome/browser/cocoa/tab_strip_controller.mm index b2267d0..c4c26c0 100644 --- a/chrome/browser/cocoa/tab_strip_controller.mm +++ b/chrome/browser/cocoa/tab_strip_controller.mm @@ -4,6 +4,7 @@ #import "chrome/browser/cocoa/tab_strip_controller.h" +#include "app/l10n_util.h" #include "base/sys_string_conversions.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser.h" @@ -16,7 +17,6 @@ #import "chrome/browser/cocoa/tab_view.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tabs/tab_strip_model.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" @implementation TabStripController diff --git a/chrome/browser/debugger/debugger_window.cc b/chrome/browser/debugger/debugger_window.cc index 0a58052..4d77dc4 100644 --- a/chrome/browser/debugger/debugger_window.cc +++ b/chrome/browser/debugger/debugger_window.cc @@ -4,6 +4,7 @@ #include "chrome/browser/debugger/debugger_window.h" +#include "app/l10n_util.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/browser_process.h" @@ -12,7 +13,6 @@ #include "chrome/browser/debugger/debugger_wrapper.h" #include "chrome/browser/tab_contents/constrained_window.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" DebuggerWindow::DebuggerWindow() : window_(NULL), diff --git a/chrome/browser/debugger/devtools_window_win.cc b/chrome/browser/debugger/devtools_window_win.cc index 36ca327..9392a7b 100644 --- a/chrome/browser/debugger/devtools_window_win.cc +++ b/chrome/browser/debugger/devtools_window_win.cc @@ -4,10 +4,10 @@ #include "chrome/browser/debugger/devtools_window_win.h" +#include "app/l10n_util.h" #include "chrome/browser/debugger/devtools_manager.h" #include "chrome/browser/debugger/devtools_view.h" #include "chrome/browser/debugger/devtools_window.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/window/window.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc index 3a189b4..230efd8 100644 --- a/chrome/browser/dom_ui/chrome_url_data_manager.cc +++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc @@ -4,6 +4,7 @@ #include "chrome/browser/dom_ui/chrome_url_data_manager.h" +#include "app/l10n_util.h" #include "base/file_util.h" #include "base/message_loop.h" #include "base/path_service.h" @@ -12,7 +13,6 @@ #include "base/values.h" #include "chrome/browser/browser_process.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/ref_counted_util.h" #include "chrome/common/url_constants.h" #include "googleurl/src/url_util.h" diff --git a/chrome/browser/dom_ui/dom_ui.cc b/chrome/browser/dom_ui/dom_ui.cc index 17a1d64..f8e0405 100644 --- a/chrome/browser/dom_ui/dom_ui.cc +++ b/chrome/browser/dom_ui/dom_ui.cc @@ -4,13 +4,13 @@ #include "chrome/browser/dom_ui/dom_ui.h" +#include "app/l10n_util.h" #include "base/json_reader.h" #include "base/json_writer.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" DOMUI::DOMUI(TabContents* contents) : hide_favicon_(false), diff --git a/chrome/browser/dom_ui/downloads_ui.cc b/chrome/browser/dom_ui/downloads_ui.cc index 639be99..8c33825 100644 --- a/chrome/browser/dom_ui/downloads_ui.cc +++ b/chrome/browser/dom_ui/downloads_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/dom_ui/downloads_ui.h" +#include "app/l10n_util.h" #include "base/gfx/png_encoder.h" #include "base/string_piece.h" #include "base/thread.h" @@ -19,7 +20,6 @@ #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/profile.h" #include "chrome/common/jstemplate_builder.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" #include "grit/browser_resources.h" diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc index ee7b3b9..74f0f25 100644 --- a/chrome/browser/dom_ui/history_ui.cc +++ b/chrome/browser/dom_ui/history_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/dom_ui/history_ui.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/string_piece.h" @@ -18,7 +19,6 @@ #include "chrome/browser/history/history_types.h" #include "chrome/browser/profile.h" #include "chrome/common/jstemplate_builder.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/dom_ui/new_tab_ui.cc b/chrome/browser/dom_ui/new_tab_ui.cc index 03091d3..d4bdf97 100644 --- a/chrome/browser/dom_ui/new_tab_ui.cc +++ b/chrome/browser/dom_ui/new_tab_ui.cc @@ -6,6 +6,7 @@ #include "chrome/browser/dom_ui/new_tab_ui.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/histogram.h" #include "base/string_piece.h" @@ -28,7 +29,6 @@ #include "chrome/browser/sessions/tab_restore_service.h" #include "chrome/browser/user_data_manager.h" #include "chrome/common/jstemplate_builder.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/download/download_item_model.cc b/chrome/browser/download/download_item_model.cc index 4756249..15fc3fd 100644 --- a/chrome/browser/download/download_item_model.cc +++ b/chrome/browser/download/download_item_model.cc @@ -4,10 +4,10 @@ #include "chrome/browser/download/download_item_model.h" +#include "app/l10n_util.h" #include "base/string_util.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/download/save_package.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/download/download_manager.cc b/chrome/browser/download/download_manager.cc index 9bf96a5..4e0b40e 100644 --- a/chrome/browser/download/download_manager.cc +++ b/chrome/browser/download/download_manager.cc @@ -4,6 +4,7 @@ #include "chrome/browser/download/download_manager.h" +#include "app/l10n_util.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/logging.h" @@ -30,7 +31,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/platform_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/download/download_request_dialog_delegate_win.cc b/chrome/browser/download/download_request_dialog_delegate_win.cc index bc68b990..7df2490 100644 --- a/chrome/browser/download/download_request_dialog_delegate_win.cc +++ b/chrome/browser/download/download_request_dialog_delegate_win.cc @@ -4,9 +4,9 @@ #include "chrome/browser/download/download_request_dialog_delegate_win.h" +#include "app/l10n_util.h" #include "chrome/browser/tab_contents/constrained_window.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 "grit/generated_resources.h" diff --git a/chrome/browser/download/download_shelf.cc b/chrome/browser/download/download_shelf.cc index 7563d71..1486ec3 100644 --- a/chrome/browser/download/download_shelf.cc +++ b/chrome/browser/download/download_shelf.cc @@ -4,13 +4,13 @@ #include "chrome/browser/download/download_shelf.h" +#include "app/l10n_util.h" #include "base/file_util.h" #include "chrome/browser/dom_ui/downloads_ui.h" #include "chrome/browser/download/download_item_model.h" #include "chrome/browser/download/download_manager.h" #include "chrome/browser/metrics/user_metrics.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/download/download_util.cc b/chrome/browser/download/download_util.cc index a3450ab..8b16539 100644 --- a/chrome/browser/download/download_util.cc +++ b/chrome/browser/download/download_util.cc @@ -8,6 +8,7 @@ #include "chrome/browser/download/download_util.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/base_drag_source.h" #include "base/file_util.h" @@ -18,7 +19,6 @@ #include "chrome/browser/download/download_manager.h" #include "chrome/browser/drag_utils.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/os_exchange_data.h" #include "chrome/views/view.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc index 920fe1d..d9af3ea 100644 --- a/chrome/browser/download/save_package.cc +++ b/chrome/browser/download/save_package.cc @@ -4,6 +4,7 @@ #include "chrome/browser/download/save_package.h" +#include "app/l10n_util.h" #include "base/file_util.h" #include "base/logging.h" #include "base/message_loop.h" @@ -26,7 +27,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/platform_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/drag_utils.cc b/chrome/browser/drag_utils.cc index 813c291..d85d080 100644 --- a/chrome/browser/drag_utils.cc +++ b/chrome/browser/drag_utils.cc @@ -8,6 +8,7 @@ #include <shlobj.h> #include <shobjidl.h> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_util.h" #include "base/gfx/gdi_util.h" @@ -16,7 +17,6 @@ #include "chrome/browser/views/bookmark_bar_view.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/os_exchange_data.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/text_button.h" diff --git a/chrome/browser/encoding_menu_controller_delegate.cc b/chrome/browser/encoding_menu_controller_delegate.cc index 5c9088f..a7a925a 100644 --- a/chrome/browser/encoding_menu_controller_delegate.cc +++ b/chrome/browser/encoding_menu_controller_delegate.cc @@ -4,13 +4,13 @@ #include "chrome/browser/encoding_menu_controller_delegate.h" +#include "app/l10n_util.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/extensions/extensions_ui.cc b/chrome/browser/extensions/extensions_ui.cc index 4a03e06..9d1dfcb 100644 --- a/chrome/browser/extensions/extensions_ui.cc +++ b/chrome/browser/extensions/extensions_ui.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/extensions_ui.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/thread.h" #include "chrome/browser/browser_process.h" @@ -12,7 +13,6 @@ #include "chrome/browser/profile.h" #include "chrome/common/extensions/url_pattern.h" #include "chrome/common/jstemplate_builder.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/url_constants.h" #include "net/base/net_util.h" diff --git a/chrome/browser/gtk/about_chrome_dialog.cc b/chrome/browser/gtk/about_chrome_dialog.cc index 5be8e40..390b618 100644 --- a/chrome/browser/gtk/about_chrome_dialog.cc +++ b/chrome/browser/gtk/about_chrome_dialog.cc @@ -7,10 +7,10 @@ #include <gtk/gtk.h> #include <wchar.h> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_version_info.h" #include "base/gfx/gtk_util.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/chrome_constants.h" #include "chrome/browser/profile.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/gtk/bookmark_bar_gtk.cc b/chrome/browser/gtk/bookmark_bar_gtk.cc index a6ca59e..6c3d85f 100644 --- a/chrome/browser/gtk/bookmark_bar_gtk.cc +++ b/chrome/browser/gtk/bookmark_bar_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/gtk/bookmark_bar_gtk.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/gtk_util.h" #include "chrome/browser/bookmarks/bookmark_context_menu.h" @@ -15,7 +16,6 @@ #include "chrome/browser/profile.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/gtk_util.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/bookmark_editor_gtk.cc b/chrome/browser/gtk/bookmark_editor_gtk.cc index 72f2522..32af739 100644 --- a/chrome/browser/gtk/bookmark_editor_gtk.cc +++ b/chrome/browser/gtk/bookmark_editor_gtk.cc @@ -6,6 +6,7 @@ #include <gtk/gtk.h> +#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/gfx/gtk_util.h" #include "base/logging.h" @@ -15,7 +16,6 @@ #include "chrome/browser/history/history.h" #include "chrome/browser/profile.h" #include "chrome/browser/net/url_fixer_upper.h" -#include "chrome/common/l10n_util.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/browser_toolbar_gtk.cc b/chrome/browser/gtk/browser_toolbar_gtk.cc index 62a5e7f..b8d956d 100644 --- a/chrome/browser/gtk/browser_toolbar_gtk.cc +++ b/chrome/browser/gtk/browser_toolbar_gtk.cc @@ -6,6 +6,7 @@ #include <gdk/gdkkeysyms.h> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/base_paths_linux.h" @@ -22,7 +23,6 @@ #include "chrome/browser/gtk/toolbar_star_toggle_gtk.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/profile.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_details.h" #include "chrome/common/notification_type.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/gtk/dialogs_gtk.cc b/chrome/browser/gtk/dialogs_gtk.cc index a3df09b..0ee22f3 100644 --- a/chrome/browser/gtk/dialogs_gtk.cc +++ b/chrome/browser/gtk/dialogs_gtk.cc @@ -6,12 +6,12 @@ #include <map> #include <set> +#include "app/l10n_util.h" #include "base/file_path.h" #include "base/logging.h" #include "base/string_util.h" #include "base/sys_string_conversions.h" #include "chrome/browser/shell_dialogs.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" // Implementation of SelectFileDialog that shows a Gtk common dialog for diff --git a/chrome/browser/gtk/download_shelf_gtk.cc b/chrome/browser/gtk/download_shelf_gtk.cc index 31d99dd..bf27bbd 100644 --- a/chrome/browser/gtk/download_shelf_gtk.cc +++ b/chrome/browser/gtk/download_shelf_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/gtk/download_shelf_gtk.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/gtk_util.h" #include "chrome/browser/download/download_item_model.h" @@ -12,7 +13,6 @@ #include "chrome/browser/gtk/link_button_gtk.h" #include "chrome/browser/gtk/slide_animator_gtk.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc index 8fd0dbe..6a9437f4 100644 --- a/chrome/browser/gtk/find_bar_gtk.cc +++ b/chrome/browser/gtk/find_bar_gtk.cc @@ -6,6 +6,7 @@ #include <gdk/gdkkeysyms.h> +#include "app/l10n_util.h" #include "base/gfx/gtk_util.h" #include "base/string_util.h" #include "chrome/browser/find_bar_controller.h" @@ -16,7 +17,6 @@ #include "chrome/browser/gtk/tab_contents_container_gtk.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/gtk_util.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" namespace { diff --git a/chrome/browser/gtk/go_button_gtk.cc b/chrome/browser/gtk/go_button_gtk.cc index 0dffad5..ef58f76 100644 --- a/chrome/browser/gtk/go_button_gtk.cc +++ b/chrome/browser/gtk/go_button_gtk.cc @@ -3,12 +3,13 @@ // found in the LICENSE file. #include "chrome/browser/gtk/go_button_gtk.h" + +#include "app/l10n_util.h" #include "base/logging.h" #include "base/message_loop.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser.h" #include "chrome/browser/gtk/location_bar_view_gtk.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc index 0ac4cdd..fd63e44 100644 --- a/chrome/browser/gtk/menu_gtk.cc +++ b/chrome/browser/gtk/menu_gtk.cc @@ -4,10 +4,10 @@ #include "chrome/browser/gtk/menu_gtk.h" +#include "app/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" #include "chrome/common/gtk_util.h" -#include "chrome/common/l10n_util.h" #include "skia/include/SkBitmap.h" MenuGtk::MenuGtk(MenuGtk::Delegate* delegate, diff --git a/chrome/browser/gtk/standard_menus.cc b/chrome/browser/gtk/standard_menus.cc index a4802ed..56ce055 100644 --- a/chrome/browser/gtk/standard_menus.cc +++ b/chrome/browser/gtk/standard_menus.cc @@ -7,9 +7,9 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> +#include "app/l10n_util.h" #include "base/basictypes.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/l10n_util.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/gtk/tabs/tab_gtk.cc b/chrome/browser/gtk/tabs/tab_gtk.cc index 6db2595..cb873b0 100644 --- a/chrome/browser/gtk/tabs/tab_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_gtk.cc @@ -4,11 +4,11 @@ #include "chrome/browser/gtk/tabs/tab_gtk.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/gtk/custom_button.h" #include "chrome/browser/gtk/menu_gtk.h" #include "chrome/common/gfx/path.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc index a9a9438..188b147 100644 --- a/chrome/browser/gtk/tabs/tab_renderer_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_renderer_gtk.cc @@ -4,11 +4,11 @@ #include "chrome/browser/gtk/tabs/tab_renderer_gtk.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/browser/browser.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "skia/ext/image_operations.h" diff --git a/chrome/browser/gtk/tabs/tab_strip_gtk.cc b/chrome/browser/gtk/tabs/tab_strip_gtk.cc index 3bc5834..b4987a5 100644 --- a/chrome/browser/gtk/tabs/tab_strip_gtk.cc +++ b/chrome/browser/gtk/tabs/tab_strip_gtk.cc @@ -4,6 +4,7 @@ #include "chrome/browser/gtk/tabs/tab_strip_gtk.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "app/slide_animation.h" #include "base/gfx/gtk_util.h" @@ -13,7 +14,6 @@ #include "chrome/browser/gtk/tabs/dragged_tab_controller_gtk.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" diff --git a/chrome/browser/hang_monitor/hung_plugin_action.cc b/chrome/browser/hang_monitor/hung_plugin_action.cc index 6acaa67..82d5fc9 100644 --- a/chrome/browser/hang_monitor/hung_plugin_action.cc +++ b/chrome/browser/hang_monitor/hung_plugin_action.cc @@ -6,8 +6,8 @@ #include "chrome/browser/hang_monitor/hung_plugin_action.h" +#include "app/l10n_util.h" #include "base/win_util.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/win_util.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/history/history.cc b/chrome/browser/history/history.cc index 1e93694..e5a27d8 100644 --- a/chrome/browser/history/history.cc +++ b/chrome/browser/history/history.cc @@ -24,6 +24,7 @@ #include "chrome/browser/history/history.h" +#include "app/l10n_util.h" #include "base/file_util.h" #include "base/message_loop.h" #include "base/path_service.h" @@ -41,7 +42,6 @@ #include "chrome/browser/profile.h" #include "chrome/browser/visitedlink_master.h" #include "chrome/common/chrome_constants.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/thumbnail_score.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/history/query_parser.cc b/chrome/browser/history/query_parser.cc index 8c3a2f3..39754ce 100644 --- a/chrome/browser/history/query_parser.cc +++ b/chrome/browser/history/query_parser.cc @@ -6,11 +6,11 @@ #include "chrome/browser/history/query_parser.h" +#include "app/l10n_util.h" #include "base/logging.h" #include "base/scoped_vector.h" #include "base/string_util.h" #include "base/word_iterator.h" -#include "chrome/common/l10n_util.h" #include "unicode/uscript.h" namespace { diff --git a/chrome/browser/history/url_database.cc b/chrome/browser/history/url_database.cc index 7f3b919..a72ce2c 100644 --- a/chrome/browser/history/url_database.cc +++ b/chrome/browser/history/url_database.cc @@ -7,8 +7,8 @@ #include <algorithm> #include <limits> +#include "app/l10n_util.h" #include "base/string_util.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/sqlite_utils.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/importer/firefox2_importer.cc b/chrome/browser/importer/firefox2_importer.cc index d1dbe05..95f7587d 100644 --- a/chrome/browser/importer/firefox2_importer.cc +++ b/chrome/browser/importer/firefox2_importer.cc @@ -4,6 +4,7 @@ #include "chrome/browser/importer/firefox2_importer.h" +#include "app/l10n_util.h" #include "base/file_path.h" #include "base/file_util.h" #include "base/path_service.h" @@ -13,7 +14,6 @@ #include "chrome/browser/importer/mork_reader.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_parser.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/importer/firefox3_importer.cc b/chrome/browser/importer/firefox3_importer.cc index 1113722..28ea6bd 100644 --- a/chrome/browser/importer/firefox3_importer.cc +++ b/chrome/browser/importer/firefox3_importer.cc @@ -6,12 +6,12 @@ #include <set> +#include "app/l10n_util.h" #include "base/file_util.h" #include "base/scoped_ptr.h" #include "base/string_util.h" #include "chrome/browser/importer/firefox2_importer.h" #include "chrome/browser/importer/firefox_importer_utils.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/importer/ie_importer.cc b/chrome/browser/importer/ie_importer.cc index 5d2dbff..dde6c19 100644 --- a/chrome/browser/importer/ie_importer.cc +++ b/chrome/browser/importer/ie_importer.cc @@ -12,6 +12,7 @@ #include <algorithm> +#include "app/l10n_util.h" #include "base/file_util.h" #include "base/registry.h" #include "base/string_util.h" @@ -20,7 +21,6 @@ #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/password_manager/ie7_password.h" #include "chrome/browser/search_engines/template_url_model.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" #include "chrome/common/url_constants.h" #include "chrome/common/win_util.h" diff --git a/chrome/browser/importer/importer.cc b/chrome/browser/importer/importer.cc index 70e98a8..333ad8c 100644 --- a/chrome/browser/importer/importer.cc +++ b/chrome/browser/importer/importer.cc @@ -7,6 +7,7 @@ #include <map> #include <set> +#include "app/l10n_util.h" #include "base/file_util.h" #include "base/gfx/png_encoder.h" #include "base/string_util.h" @@ -28,7 +29,6 @@ #include "chrome/browser/tab_contents/site_instance.h" #include "chrome/browser/webdata/web_data_service.h" #include "chrome/common/gfx/favicon_size.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/importer/toolbar_importer.cc b/chrome/browser/importer/toolbar_importer.cc index 22594e6..0f7c12f 100644 --- a/chrome/browser/importer/toolbar_importer.cc +++ b/chrome/browser/importer/toolbar_importer.cc @@ -6,10 +6,10 @@ #include <limits> +#include "app/l10n_util.h" #include "base/string_util.h" #include "base/rand_util.h" #include "chrome/browser/first_run.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/libxml_utils.h" #include "grit/generated_resources.h" #include "net/base/cookie_monster.h" diff --git a/chrome/browser/input_window_dialog_win.cc b/chrome/browser/input_window_dialog_win.cc index 9d1fa2b..f92d6e5 100644 --- a/chrome/browser/input_window_dialog_win.cc +++ b/chrome/browser/input_window_dialog_win.cc @@ -4,10 +4,10 @@ #include "chrome/browser/input_window_dialog.h" +#include "app/l10n_util.h" #include "base/message_loop.h" #include "base/task.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/jsmessage_box_handler.cc b/chrome/browser/jsmessage_box_handler.cc index 71b7d3d..41edfec 100644 --- a/chrome/browser/jsmessage_box_handler.cc +++ b/chrome/browser/jsmessage_box_handler.cc @@ -4,13 +4,13 @@ #include "chrome/browser/jsmessage_box_handler.h" +#include "app/l10n_util.h" #include "build/build_config.h" #include "chrome/browser/app_modal_dialog_queue.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/gfx/text_elider.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/login_prompt.cc b/chrome/browser/login_prompt.cc index 8a52d5d..8ddb96a 100644 --- a/chrome/browser/login_prompt.cc +++ b/chrome/browser/login_prompt.cc @@ -4,6 +4,7 @@ #include "chrome/browser/login_prompt.h" +#include "app/l10n_util.h" #include "base/command_line.h" #include "base/lock.h" #include "base/message_loop.h" @@ -17,7 +18,6 @@ #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/views/login_view.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/views/window/dialog_delegate.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/password_manager/password_manager.cc b/chrome/browser/password_manager/password_manager.cc index 2d0e7f0..b558bf94 100644 --- a/chrome/browser/password_manager/password_manager.cc +++ b/chrome/browser/password_manager/password_manager.cc @@ -4,12 +4,12 @@ #include "chrome/browser/password_manager/password_manager.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "chrome/browser/profile.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_registrar.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_names.h" diff --git a/chrome/browser/plugin_installer.cc b/chrome/browser/plugin_installer.cc index aa803b4..82da4dd 100644 --- a/chrome/browser/plugin_installer.cc +++ b/chrome/browser/plugin_installer.cc @@ -4,10 +4,10 @@ #include "chrome/browser/plugin_installer.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" #include "grit/theme_resources.h" #include "webkit/default_plugin/default_plugin_shared.h" diff --git a/chrome/browser/printing/print_view_manager.cc b/chrome/browser/printing/print_view_manager.cc index 930c0be..f717023 100644 --- a/chrome/browser/printing/print_view_manager.cc +++ b/chrome/browser/printing/print_view_manager.cc @@ -4,6 +4,7 @@ #include "chrome/browser/printing/print_view_manager.h" +#include "app/l10n_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/printing/print_job.h" #include "chrome/browser/printing/print_job_manager.h" @@ -13,7 +14,6 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/gfx/emf.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/render_messages.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc index b3ce8f7..cffd597 100644 --- a/chrome/browser/process_singleton_win.cc +++ b/chrome/browser/process_singleton_win.cc @@ -4,6 +4,7 @@ #include "chrome/browser/process_singleton.h" +#include "app/l10n_util.h" #include "base/base_paths.h" #include "base/command_line.h" #include "base/process_util.h" @@ -14,7 +15,6 @@ #include "chrome/browser/profile_manager.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/result_codes.h" #include "chrome/common/win_util.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/profile_manager.cc b/chrome/browser/profile_manager.cc index f3fa543..26650cc 100644 --- a/chrome/browser/profile_manager.cc +++ b/chrome/browser/profile_manager.cc @@ -6,6 +6,7 @@ #include "chrome/browser/profile_manager.h" +#include "app/l10n_util.h" #include "base/file_util.h" #include "base/path_service.h" #include "base/string_util.h" @@ -15,7 +16,6 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" diff --git a/chrome/browser/renderer_host/render_widget_host_view_win.cc b/chrome/browser/renderer_host/render_widget_host_view_win.cc index b143f2e..75a2b03 100644 --- a/chrome/browser/renderer_host/render_widget_host_view_win.cc +++ b/chrome/browser/renderer_host/render_widget_host_view_win.cc @@ -4,6 +4,8 @@ #include "chrome/browser/renderer_host/render_widget_host_view_win.h" +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/gfx/gdi_util.h" @@ -21,8 +23,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/common/native_web_keyboard_event.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index 63f9542..7ebfbc6 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -6,6 +6,7 @@ #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/histogram.h" #include "base/string_util.h" @@ -19,7 +20,6 @@ #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/jstemplate_builder.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/url_constants.h" #include "grit/browser_resources.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc index b73bdd0..61b8da8 100644 --- a/chrome/browser/search_engines/template_url.cc +++ b/chrome/browser/search_engines/template_url.cc @@ -4,6 +4,7 @@ #include "chrome/browser/search_engines/template_url.h" +#include "app/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" @@ -11,7 +12,6 @@ #include "chrome/browser/google_url_tracker.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/gfx/favicon_size.h" -#include "chrome/common/l10n_util.h" #include "net/base/escape.h" // The TemplateURLRef has any number of terms that need to be replaced. Each of diff --git a/chrome/browser/search_engines/template_url_model.cc b/chrome/browser/search_engines/template_url_model.cc index 10f9137..97dd1d0 100644 --- a/chrome/browser/search_engines/template_url_model.cc +++ b/chrome/browser/search_engines/template_url_model.cc @@ -6,6 +6,7 @@ #include <algorithm> +#include "app/l10n_util.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/string_util.h" @@ -17,7 +18,6 @@ #include "chrome/browser/rlz/rlz.h" #include "chrome/browser/search_engines/template_url.h" #include "chrome/browser/search_engines/template_url_prepopulate_data.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/session_history_uitest.cc b/chrome/browser/session_history_uitest.cc index 4fd7ba4..7805173 100644 --- a/chrome/browser/session_history_uitest.cc +++ b/chrome/browser/session_history_uitest.cc @@ -2,10 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "app/l10n_util.h" #include "base/file_path.h" #include "base/platform_thread.h" #include "base/string_util.h" -#include "chrome/common/l10n_util.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/ui/ui_test.h" diff --git a/chrome/browser/spellchecker.cc b/chrome/browser/spellchecker.cc index ba2b84a..1a28cf1 100644 --- a/chrome/browser/spellchecker.cc +++ b/chrome/browser/spellchecker.cc @@ -2,6 +2,7 @@ // 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 "chrome/browser/spellchecker.h" #include "base/basictypes.h" #include "base/compiler_specific.h" @@ -18,7 +19,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_counters.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_service.h" #include "chrome/third_party/hunspell/src/hunspell/hunspell.hxx" diff --git a/chrome/browser/spellchecker.h b/chrome/browser/spellchecker.h index e7f4972..2827991 100644 --- a/chrome/browser/spellchecker.h +++ b/chrome/browser/spellchecker.h @@ -7,11 +7,11 @@ #include <vector> +#include "app/l10n_util.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" #include "chrome/browser/spellcheck_worditerator.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/pref_names.h" #include "chrome/common/pref_member.h" diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index f37317c..24794c0 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ssl/ssl_blocking_page.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/histogram.h" #include "base/string_piece.h" @@ -16,7 +17,6 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/jstemplate_builder.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/ssl/ssl_error_info.cc b/chrome/browser/ssl/ssl_error_info.cc index a101f8b..d47529a 100644 --- a/chrome/browser/ssl/ssl_error_info.cc +++ b/chrome/browser/ssl/ssl_error_info.cc @@ -4,9 +4,9 @@ #include "chrome/browser/ssl/ssl_error_info.h" +#include "app/l10n_util.h" #include "base/string_util.h" #include "chrome/browser/cert_store.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" #include "googleurl/src/gurl.h" #include "grit/chromium_strings.h" diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc index f5b0602..01125a0 100644 --- a/chrome/browser/ssl/ssl_manager.cc +++ b/chrome/browser/ssl/ssl_manager.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ssl/ssl_manager.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/message_loop.h" #include "base/string_util.h" @@ -20,7 +21,6 @@ #include "chrome/browser/tab_contents/provisional_load_details.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/browser/tab_contents/tab_util.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/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc index 855c3f0..829af05 100644 --- a/chrome/browser/ssl/ssl_policy.cc +++ b/chrome/browser/ssl/ssl_policy.cc @@ -4,6 +4,7 @@ #include "chrome/browser/ssl/ssl_policy.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/singleton.h" #include "base/string_piece.h" @@ -14,7 +15,6 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/jstemplate_builder.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/tab_contents/infobar_delegate.cc b/chrome/browser/tab_contents/infobar_delegate.cc index 9a466fb..9ddbdd4 100644 --- a/chrome/browser/tab_contents/infobar_delegate.cc +++ b/chrome/browser/tab_contents/infobar_delegate.cc @@ -4,12 +4,12 @@ #include "chrome/browser/tab_contents/infobar_delegate.h" +#include "app/l10n_util.h" #include "base/logging.h" #include "build/build_config.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/tab_contents.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" // InfoBarDelegate: ------------------------------------------------------------ diff --git a/chrome/browser/tab_contents/render_view_context_menu.cc b/chrome/browser/tab_contents/render_view_context_menu.cc index 3a22a5a..8c5e862 100644 --- a/chrome/browser/tab_contents/render_view_context_menu.cc +++ b/chrome/browser/tab_contents/render_view_context_menu.cc @@ -4,6 +4,7 @@ #include "chrome/browser/tab_contents/render_view_context_menu.h" +#include "app/l10n_util.h" #include "base/clipboard.h" #include "base/command_line.h" #include "base/logging.h" @@ -18,7 +19,6 @@ #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/platform_util.h" #include "chrome/common/pref_service.h" #include "chrome/common/url_constants.h" diff --git a/chrome/browser/tab_contents/render_view_context_menu_mac.mm b/chrome/browser/tab_contents/render_view_context_menu_mac.mm index b2cc94f..ba55aa2 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_mac.mm +++ b/chrome/browser/tab_contents/render_view_context_menu_mac.mm @@ -4,10 +4,10 @@ #include "chrome/browser/tab_contents/render_view_context_menu_mac.h" +#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "base/sys_string_conversions.h" #include "chrome/browser/profile.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" // Obj-C bridge class that is the target of all items in the context menu. diff --git a/chrome/browser/tab_contents/render_view_context_menu_win.cc b/chrome/browser/tab_contents/render_view_context_menu_win.cc index ea2a2d0..87dce53 100644 --- a/chrome/browser/tab_contents/render_view_context_menu_win.cc +++ b/chrome/browser/tab_contents/render_view_context_menu_win.cc @@ -4,9 +4,9 @@ #include "chrome/browser/tab_contents/render_view_context_menu_win.h" +#include "app/l10n_util.h" #include "base/compiler_specific.h" #include "chrome/browser/profile.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" RenderViewContextMenuWin::RenderViewContextMenuWin( diff --git a/chrome/browser/tab_contents/tab_contents.cc b/chrome/browser/tab_contents/tab_contents.cc index 92d5584..38c6d19 100644 --- a/chrome/browser/tab_contents/tab_contents.cc +++ b/chrome/browser/tab_contents/tab_contents.cc @@ -4,6 +4,7 @@ #include "chrome/browser/tab_contents/tab_contents.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/file_version_info.h" #include "base/process_util.h" @@ -37,7 +38,6 @@ #include "chrome/browser/search_engines/template_url_fetcher.h" #include "chrome/browser/search_engines/template_url_model.h" #include "chrome/common/chrome_switches.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/task_manager.cc b/chrome/browser/task_manager.cc index 4f96d2b..c82806a 100644 --- a/chrome/browser/task_manager.cc +++ b/chrome/browser/task_manager.cc @@ -4,6 +4,7 @@ #include "chrome/browser/task_manager.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/process_util.h" #include "base/stats_table.h" @@ -15,7 +16,6 @@ #include "chrome/browser/task_manager_resource_providers.h" #include "chrome/browser/tab_contents/tab_util.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/accelerator.h" diff --git a/chrome/browser/task_manager_resource_providers.cc b/chrome/browser/task_manager_resource_providers.cc index 2d29f8f..49c4473 100644 --- a/chrome/browser/task_manager_resource_providers.cc +++ b/chrome/browser/task_manager_resource_providers.cc @@ -4,6 +4,7 @@ #include "chrome/browser/task_manager_resource_providers.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/basictypes.h" #include "base/file_version_info.h" @@ -19,7 +20,6 @@ #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/browser/tab_contents/tab_contents.h" #include "chrome/common/child_process_host.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #if defined(OS_WIN) #include "chrome/common/gfx/icon_util.h" diff --git a/chrome/browser/toolbar_model.cc b/chrome/browser/toolbar_model.cc index 4f9c98e..ec6be7c 100644 --- a/chrome/browser/toolbar_model.cc +++ b/chrome/browser/toolbar_model.cc @@ -4,13 +4,13 @@ #include "chrome/browser/toolbar_model.h" +#include "app/l10n_util.h" #include "chrome/browser/cert_store.h" #include "chrome/browser/ssl/ssl_error_info.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/navigation_entry.h" #include "chrome/browser/tab_contents/tab_contents.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 "grit/generated_resources.h" diff --git a/chrome/browser/user_data_manager.cc b/chrome/browser/user_data_manager.cc index e066cf1..0542576 100644 --- a/chrome/browser/user_data_manager.cc +++ b/chrome/browser/user_data_manager.cc @@ -8,6 +8,7 @@ #include <string> +#include "app/l10n_util.h" #include "base/file_util.h" #include "base/logging.h" #include "base/message_loop.h" @@ -18,7 +19,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/l10n_util.h" #include "chrome/installer/util/browser_distribution.h" #include "grit/chromium_strings.h" 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" diff --git a/chrome/browser/webdata/web_database.cc b/chrome/browser/webdata/web_database.cc index 9497885..e6a1731 100644 --- a/chrome/browser/webdata/web_database.cc +++ b/chrome/browser/webdata/web_database.cc @@ -8,13 +8,13 @@ #include <limits> #include <vector> +#include "app/l10n_util.h" #include "base/gfx/png_decoder.h" #include "base/gfx/png_encoder.h" #include "base/string_util.h" #include "base/time.h" #include "chrome/browser/history/history_database.h" #include "chrome/browser/search_engines/template_url.h" -#include "chrome/common/l10n_util.h" #include "webkit/glue/password_form.h" // Encryptor is the *wrong* way of doing things; we need to turn it into a diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 9d6a262..1d75fa5 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -126,6 +126,11 @@ # All .cc, .h, and .mm files under app/ except for tests. '../app/animation.cc', '../app/animation.h', + '../app/l10n_util.cc', + '../app/l10n_util.h', + '../app/l10n_util_posix.cc', + '../app/l10n_util_win.cc', + '../app/l10n_util_win.h', '../app/resource_bundle.cc', '../app/resource_bundle.h', '../app/resource_bundle_win.cc', @@ -313,11 +318,6 @@ 'common/json_value_serializer.h', 'common/jstemplate_builder.cc', 'common/jstemplate_builder.h', - 'common/l10n_util.cc', - 'common/l10n_util.h', - 'common/l10n_util_posix.cc', - 'common/l10n_util_win.cc', - 'common/l10n_util_win.h', 'common/libxml_utils.cc', 'common/libxml_utils.h', 'common/logging_chrome.cc', @@ -2503,7 +2503,7 @@ 'common/ipc_sync_message_unittest.cc', 'common/ipc_sync_message_unittest.h', 'common/json_value_serializer_unittest.cc', - 'common/l10n_util_unittest.cc', + '../app/l10n_util_unittest.cc', 'common/mru_cache_unittest.cc', 'common/net/url_util_unittest.cc', 'common/notification_service_unittest.cc', diff --git a/chrome/common/child_process_info.cc b/chrome/common/child_process_info.cc index 5ef4469..bd4c070 100644 --- a/chrome/common/child_process_info.cc +++ b/chrome/common/child_process_info.cc @@ -6,11 +6,11 @@ #include <limits> +#include "app/l10n_util.h" #include "base/logging.h" #include "base/process_util.h" #include "base/rand_util.h" #include "base/string_util.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" std::wstring ChildProcessInfo::GetTypeNameInEnglish( diff --git a/chrome/common/common.vcproj b/chrome/common/common.vcproj index 27db826..e8519d6 100644 --- a/chrome/common/common.vcproj +++ b/chrome/common/common.vcproj @@ -534,22 +534,6 @@ > </File> <File - RelativePath=".\l10n_util.cc" - > - </File> - <File - RelativePath=".\l10n_util.h" - > - </File> - <File - RelativePath=".\l10n_util_win.cc" - > - </File> - <File - RelativePath=".\l10n_util_win.h" - > - </File> - <File RelativePath=".\libxml_utils.cc" > </File> diff --git a/chrome/common/common_glue.cc b/chrome/common/common_glue.cc index c79a713..00e9817 100644 --- a/chrome/common/common_glue.cc +++ b/chrome/common/common_glue.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "app/l10n_util.h" #include "base/command_line.h" #include "base/path_service.h" #include "base/string16.h" @@ -9,7 +10,6 @@ #include "build/build_config.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/l10n_util.h" #include "chrome/plugin/npobject_util.h" #include "googleurl/src/url_util.h" #include "webkit/glue/webkit_glue.h" diff --git a/chrome/common/gfx/chrome_canvas.cc b/chrome/common/gfx/chrome_canvas.cc index 23bc1c9..328bf65 100644 --- a/chrome/common/gfx/chrome_canvas.cc +++ b/chrome/common/gfx/chrome_canvas.cc @@ -6,11 +6,11 @@ #include <limits> +#include "app/l10n_util.h" #include "base/gfx/rect.h" #include "base/logging.h" #include "skia/include/SkShader.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" bool ChromeCanvas::GetClipRect(gfx::Rect* r) { SkRect clip; diff --git a/chrome/common/gfx/chrome_canvas_win.cc b/chrome/common/gfx/chrome_canvas_win.cc index 1f14703..aefb640 100644 --- a/chrome/common/gfx/chrome_canvas_win.cc +++ b/chrome/common/gfx/chrome_canvas_win.cc @@ -6,10 +6,10 @@ #include <limits> +#include "app/l10n_util.h" #include "base/gfx/rect.h" #include "skia/include/SkShader.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" namespace { diff --git a/chrome/common/gfx/chrome_font_win.cc b/chrome/common/gfx/chrome_font_win.cc index acfc40e..71b10d8 100644 --- a/chrome/common/gfx/chrome_font_win.cc +++ b/chrome/common/gfx/chrome_font_win.cc @@ -9,9 +9,9 @@ #include <algorithm> +#include "app/l10n_util_win.h" #include "base/logging.h" #include "base/win_util.h" -#include "chrome/common/l10n_util_win.h" #include "grit/generated_resources.h" #include "grit/locale_settings.h" diff --git a/chrome/common/os_exchange_data.cc b/chrome/common/os_exchange_data.cc index 114c480..969724f 100644 --- a/chrome/common/os_exchange_data.cc +++ b/chrome/common/os_exchange_data.cc @@ -6,6 +6,7 @@ #include "chrome/common/os_exchange_data.h" +#include "app/l10n_util.h" #include "base/clipboard_util.h" #include "base/file_util.h" #include "base/logging.h" @@ -13,7 +14,6 @@ #include "base/scoped_handle.h" #include "base/stl_util-inl.h" #include "base/string_util.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/win_util.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" diff --git a/chrome/common/platform_util_mac.mm b/chrome/common/platform_util_mac.mm index b5c685b..a75ea4b 100644 --- a/chrome/common/platform_util_mac.mm +++ b/chrome/common/platform_util_mac.mm @@ -6,11 +6,11 @@ #import <Cocoa/Cocoa.h> +#include "app/l10n_util.h" #include "base/file_path.h" #include "base/logging.h" #include "base/sys_string_conversions.h" #include "chrome/browser/cocoa/tab_window_controller.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" namespace platform_util { diff --git a/chrome/common/pref_service.cc b/chrome/common/pref_service.cc index 7ea11ee..85abb4f 100644 --- a/chrome/common/pref_service.cc +++ b/chrome/common/pref_service.cc @@ -4,13 +4,13 @@ #include "chrome/common/pref_service.h" +#include "app/l10n_util.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "base/thread.h" #include "chrome/common/json_value_serializer.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "grit/generated_resources.h" diff --git a/chrome/common/security_filter_peer.cc b/chrome/common/security_filter_peer.cc index 67ed158..3b1c9f0 100644 --- a/chrome/common/security_filter_peer.cc +++ b/chrome/common/security_filter_peer.cc @@ -4,11 +4,11 @@ #include "chrome/common/security_filter_peer.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/png_encoder.h" #include "base/gfx/size.h" #include "base/string_util.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" #include "grit/renderer_resources.h" #include "net/base/net_errors.h" diff --git a/chrome/common/time_format.cc b/chrome/common/time_format.cc index 6d0b7d1..c4bd179 100644 --- a/chrome/common/time_format.cc +++ b/chrome/common/time_format.cc @@ -6,6 +6,7 @@ #include <vector> +#include "app/l10n_util.h" #include "base/logging.h" #include "base/scoped_ptr.h" #include "base/singleton.h" @@ -13,7 +14,6 @@ #include "base/string_util.h" #include "base/time.h" #include "base/time_format.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" #include "unicode/datefmt.h" #include "unicode/locid.h" diff --git a/chrome/common/time_format_unittest.cc b/chrome/common/time_format_unittest.cc index c910209..d437859 100644 --- a/chrome/common/time_format_unittest.cc +++ b/chrome/common/time_format_unittest.cc @@ -4,9 +4,9 @@ #include <time.h> +#include "app/l10n_util.h" #include "base/basictypes.h" #include "base/time.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/time_format.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/common/win_util.cc b/chrome/common/win_util.cc index fa3ce49..95fc132 100644 --- a/chrome/common/win_util.cc +++ b/chrome/common/win_util.cc @@ -11,6 +11,8 @@ #include <shellapi.h> #include <shlobj.h> +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "base/file_util.h" #include "base/gfx/gdi_util.h" #include "base/gfx/png_encoder.h" @@ -19,8 +21,6 @@ #include "base/scoped_handle.h" #include "base/string_util.h" #include "base/win_util.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "grit/generated_resources.h" #include "net/base/mime_util.h" diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc index af89563..a310d60 100644 --- a/chrome/renderer/localized_error.cc +++ b/chrome/renderer/localized_error.cc @@ -4,10 +4,10 @@ #include "chrome/renderer/localized_error.h" +#include "app/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" #include "base/values.h" -#include "chrome/common/l10n_util.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" #include "net/base/escape.h" diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index e0b661e..c5407d5 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/compiler_specific.h" @@ -21,7 +22,6 @@ #include "chrome/common/gfx/favicon_size.h" #include "chrome/common/gfx/color_utils.h" #include "chrome/common/jstemplate_builder.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/message_box_flags.h" #include "chrome/common/page_zoom.h" #include "chrome/common/render_messages.h" diff --git a/chrome/renderer/renderer_main.cc b/chrome/renderer/renderer_main.cc index 33e1742..74b5334 100644 --- a/chrome/renderer/renderer_main.cc +++ b/chrome/renderer/renderer_main.cc @@ -2,6 +2,7 @@ // 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 "app/resource_bundle.h" #include "base/command_line.h" #include "base/histogram.h" @@ -16,7 +17,6 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_counters.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/main_function_params.h" #include "chrome/renderer/renderer_main_platform_delegate.h" diff --git a/chrome/renderer/webplugin_delegate_proxy.cc b/chrome/renderer/webplugin_delegate_proxy.cc index 2570390..e911b09 100644 --- a/chrome/renderer/webplugin_delegate_proxy.cc +++ b/chrome/renderer/webplugin_delegate_proxy.cc @@ -10,6 +10,7 @@ #include <atlbase.h> #endif +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/ref_counted.h" @@ -18,7 +19,6 @@ #include "base/gfx/native_widget_types.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/plugin_messages.h" #include "chrome/common/render_messages.h" #include "chrome/plugin/npobject_proxy.h" diff --git a/chrome/test/accessibility/accessibility_tests.cc b/chrome/test/accessibility/accessibility_tests.cc index 107b346..7393f85 100644 --- a/chrome/test/accessibility/accessibility_tests.cc +++ b/chrome/test/accessibility/accessibility_tests.cc @@ -4,10 +4,10 @@ #include <oleacc.h> +#include "app/l10n_util.h" #include "base/file_path.h" #include "base/win_util.h" #include "chrome/app/chrome_dll_resource.h" -#include "chrome/common/l10n_util.h" #include "chrome/test/accessibility/accessibility_util.h" #include "chrome/test/ui/ui_test.h" #include "chrome/test/automation/browser_proxy.h" diff --git a/chrome/test/accessibility/accessibility_util.cc b/chrome/test/accessibility/accessibility_util.cc index eb18a1a..0861cc2 100644 --- a/chrome/test/accessibility/accessibility_util.cc +++ b/chrome/test/accessibility/accessibility_util.cc @@ -4,9 +4,9 @@ #include "chrome/test/accessibility/accessibility_util.h" +#include "app/l10n_util.h" #include "base/win_util.h" #include "chrome/browser/view_ids.h" -#include "chrome/common/l10n_util.h" #include "chrome/test/accessibility/constants.h" #include "grit/chromium_strings.h" #include "grit/generated_resources.h" diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj index 5eb02d9..9f84d5e 100644 --- a/chrome/test/unit/unittests.vcproj +++ b/chrome/test/unit/unittests.vcproj @@ -988,10 +988,6 @@ > </File> <File - RelativePath="..\..\common\l10n_util_unittest.cc" - > - </File> - <File RelativePath="..\..\common\mru_cache_unittest.cc" > </File> @@ -1099,6 +1095,10 @@ RelativePath="..\..\..\app\animation_unittest.cc" > </File> + <File + RelativePath="..\..\..\app\l10n_util_unittest.cc" + > + </File> </Filter> </Files> <Globals> diff --git a/chrome/views/accelerator.cc b/chrome/views/accelerator.cc index 9bbda74..b1c6191 100644 --- a/chrome/views/accelerator.cc +++ b/chrome/views/accelerator.cc @@ -6,9 +6,9 @@ #include <windows.h> +#include "app/l10n_util.h" #include "base/logging.h" #include "base/string_util.h" -#include "chrome/common/l10n_util.h" #include "grit/generated_resources.h" namespace views { diff --git a/chrome/views/controls/button/button_dropdown.cc b/chrome/views/controls/button/button_dropdown.cc index 89abf85..5598a18 100644 --- a/chrome/views/controls/button/button_dropdown.cc +++ b/chrome/views/controls/button/button_dropdown.cc @@ -4,8 +4,8 @@ #include "chrome/views/controls/button/button_dropdown.h" +#include "app/l10n_util.h" #include "base/message_loop.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/controls/menu/view_menu_delegate.h" #include "chrome/views/widget/widget.h" #include "grit/generated_resources.h" diff --git a/chrome/views/controls/button/menu_button.cc b/chrome/views/controls/button/menu_button.cc index 9f0ec74..a4ad6aa 100644 --- a/chrome/views/controls/button/menu_button.cc +++ b/chrome/views/controls/button/menu_button.cc @@ -4,10 +4,10 @@ #include "chrome/views/controls/button/menu_button.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "chrome/common/drag_drop_types.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/button.h" #include "chrome/views/controls/menu/view_menu_delegate.h" diff --git a/chrome/views/controls/button/native_button.cc b/chrome/views/controls/button/native_button.cc index e5c1850..511f45b 100644 --- a/chrome/views/controls/button/native_button.cc +++ b/chrome/views/controls/button/native_button.cc @@ -4,8 +4,8 @@ #include "chrome/views/controls/button/native_button.h" +#include "app/l10n_util.h" #include "base/logging.h" -#include "chrome/common/l10n_util.h" namespace views { diff --git a/chrome/views/controls/button/text_button.cc b/chrome/views/controls/button/text_button.cc index b821db9..add909b 100644 --- a/chrome/views/controls/button/text_button.cc +++ b/chrome/views/controls/button/text_button.cc @@ -4,10 +4,10 @@ #include "chrome/views/controls/button/text_button.h" +#include "app/l10n_util.h" #include "app/throb_animation.h" #include "app/resource_bundle.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/controls/button/button.h" #include "chrome/views/event.h" #include "grit/theme_resources.h" diff --git a/chrome/views/controls/combo_box.cc b/chrome/views/controls/combo_box.cc index eaf8a07..375dd3a7 100644 --- a/chrome/views/controls/combo_box.cc +++ b/chrome/views/controls/combo_box.cc @@ -4,12 +4,12 @@ #include "chrome/views/controls/combo_box.h" +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" #include "base/gfx/rect.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" // Limit how small a combobox can be. static const int kMinComboboxWidth = 148; diff --git a/chrome/views/controls/label.cc b/chrome/views/controls/label.cc index b14527e..5ef0381 100644 --- a/chrome/views/controls/label.cc +++ b/chrome/views/controls/label.cc @@ -6,6 +6,7 @@ #include <math.h> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/logging.h" #include "base/string_util.h" @@ -13,7 +14,6 @@ #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/insets.h" #include "chrome/common/gfx/text_elider.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/background.h" namespace views { diff --git a/chrome/views/controls/label_unittest.cc b/chrome/views/controls/label_unittest.cc index fb1d057..b287c29 100644 --- a/chrome/views/controls/label_unittest.cc +++ b/chrome/views/controls/label_unittest.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/string_util.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/border.h" #include "chrome/views/controls/label.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/views/controls/menu/chrome_menu.cc b/chrome/views/controls/menu/chrome_menu.cc index cb94de3..ef398f4 100644 --- a/chrome/views/controls/menu/chrome_menu.cc +++ b/chrome/views/controls/menu/chrome_menu.cc @@ -8,6 +8,8 @@ #include <uxtheme.h> #include <Vssym32.h> +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "base/base_drag_source.h" #include "base/gfx/native_theme.h" #include "base/message_loop.h" @@ -18,8 +20,6 @@ #include "chrome/browser/drag_utils.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/color_utils.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/common/os_exchange_data.h" #include "chrome/views/border.h" #include "chrome/views/view_constants.h" diff --git a/chrome/views/controls/menu/menu.cc b/chrome/views/controls/menu/menu.cc index 050c3fa..e46eaa0 100644 --- a/chrome/views/controls/menu/menu.cc +++ b/chrome/views/controls/menu/menu.cc @@ -12,14 +12,14 @@ #include <atlmisc.h> #include <string> +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "base/gfx/rect.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "base/string_util.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/views/accelerator.h" const SkBitmap* Menu::Delegate::kEmptyIcon = 0; diff --git a/chrome/views/controls/message_box_view.cc b/chrome/views/controls/message_box_view.cc index 33f6ce4..191b78c 100644 --- a/chrome/views/controls/message_box_view.cc +++ b/chrome/views/controls/message_box_view.cc @@ -4,13 +4,13 @@ #include "chrome/views/controls/message_box_view.h" +#include "app/l10n_util.h" #include "base/clipboard.h" #include "base/message_loop.h" #include "base/scoped_clipboard_writer.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/views/standard_layout.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/message_box_flags.h" #include "chrome/views/controls/button/checkbox.h" #include "chrome/views/window/client_view.h" diff --git a/chrome/views/controls/native_control.cc b/chrome/views/controls/native_control.cc index 5e07e41..84a3226 100644 --- a/chrome/views/controls/native_control.cc +++ b/chrome/views/controls/native_control.cc @@ -9,9 +9,9 @@ #include <atlcrack.h> #include <atlframe.h> +#include "app/l10n_util_win.h" #include "base/logging.h" #include "base/win_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/common/notification_service.h" #include "chrome/views/background.h" #include "chrome/views/border.h" diff --git a/chrome/views/controls/native_control_win.cc b/chrome/views/controls/native_control_win.cc index eb172e9..d493f66 100644 --- a/chrome/views/controls/native_control_win.cc +++ b/chrome/views/controls/native_control_win.cc @@ -4,9 +4,9 @@ #include "chrome/views/controls/native_control_win.h" +#include "app/l10n_util_win.h" #include "base/logging.h" #include "base/win_util.h" -#include "chrome/common/l10n_util_win.h" namespace views { diff --git a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc b/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc index 42ba4e7..da35a62 100644 --- a/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc +++ b/chrome/views/controls/scrollbar/bitmap_scroll_bar.cc @@ -4,9 +4,9 @@ #include "chrome/views/controls/scrollbar/bitmap_scroll_bar.h" +#include "app/l10n_util.h" #include "base/message_loop.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/controls/menu/menu.h" #include "chrome/views/controls/scroll_view.h" #include "chrome/views/widget/widget.h" diff --git a/chrome/views/controls/tabbed_pane.cc b/chrome/views/controls/tabbed_pane.cc index 64d267b1..75d7f03 100644 --- a/chrome/views/controls/tabbed_pane.cc +++ b/chrome/views/controls/tabbed_pane.cc @@ -6,13 +6,13 @@ #include <vssym32.h> +#include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "base/gfx/native_theme.h" #include "base/logging.h" #include "base/stl_util-inl.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/views/background.h" #include "chrome/views/fill_layout.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/views/controls/table/table_view.cc b/chrome/views/controls/table/table_view.cc index 828aeae..a794e91 100644 --- a/chrome/views/controls/table/table_view.cc +++ b/chrome/views/controls/table/table_view.cc @@ -7,13 +7,13 @@ #include <algorithm> #include <windowsx.h> +#include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "base/string_util.h" #include "base/win_util.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/favicon_size.h" #include "chrome/common/gfx/icon_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/hwnd_view.h" #include "SkBitmap.h" diff --git a/chrome/views/controls/table/table_view.h b/chrome/views/controls/table/table_view.h index ec575c7..e411d8a 100644 --- a/chrome/views/controls/table/table_view.h +++ b/chrome/views/controls/table/table_view.h @@ -16,8 +16,8 @@ #include <unicode/uchar.h> #include <vector> +#include "app/l10n_util.h" #include "base/logging.h" -#include "chrome/common/l10n_util.h" #if defined(OS_WIN) // TODO(port): remove the ifdef when native_control.h is ported. #include "chrome/views/controls/native_control.h" diff --git a/chrome/views/controls/text_field.cc b/chrome/views/controls/text_field.cc index 5992fd3..4e61afd 100644 --- a/chrome/views/controls/text_field.cc +++ b/chrome/views/controls/text_field.cc @@ -11,6 +11,8 @@ #include <tom.h> // For ITextDocument, a COM interface to CRichEditCtrl #include <vsstyle.h> +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "base/clipboard.h" #include "base/gfx/native_theme.h" #include "base/scoped_clipboard_writer.h" @@ -18,8 +20,6 @@ #include "base/win_util.h" #include "chrome/browser/browser_process.h" #include "chrome/common/gfx/insets.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/hwnd_view.h" diff --git a/chrome/views/controls/tree/tree_view.cc b/chrome/views/controls/tree/tree_view.cc index e09711f..13e1914d 100644 --- a/chrome/views/controls/tree/tree_view.cc +++ b/chrome/views/controls/tree/tree_view.cc @@ -6,13 +6,13 @@ #include <shellapi.h> +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "app/resource_bundle.h" #include "base/stl_util-inl.h" #include "base/win_util.h" #include "chrome/common/gfx/chrome_canvas.h" #include "chrome/common/gfx/icon_util.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/views/focus/focus_manager.h" #include "chrome/views/widget/widget.h" #include "grit/theme_resources.h" diff --git a/chrome/views/view.cc b/chrome/views/view.cc index f509f7d..561ee70 100644 --- a/chrome/views/view.cc +++ b/chrome/views/view.cc @@ -10,13 +10,13 @@ #include <iostream> #endif +#include "app/l10n_util.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/scoped_handle.h" #include "base/string_util.h" #include "chrome/common/drag_drop_types.h" #include "chrome/common/gfx/chrome_canvas.h" -#include "chrome/common/l10n_util.h" #include "chrome/views/background.h" #include "chrome/views/layout_manager.h" #include "chrome/views/widget/root_view.h" diff --git a/chrome/views/widget/aero_tooltip_manager.cc b/chrome/views/widget/aero_tooltip_manager.cc index e6ed9da..6e1a5fa 100644 --- a/chrome/views/widget/aero_tooltip_manager.cc +++ b/chrome/views/widget/aero_tooltip_manager.cc @@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "chrome/views/widget/aero_tooltip_manager.h" + #include <windows.h> #include <atlbase.h> #include <atlapp.h> // for GET_X/Y_LPARAM #include <commctrl.h> #include <shlobj.h> -#include "chrome/views/widget/aero_tooltip_manager.h" - +#include "app/l10n_util_win.h" #include "base/message_loop.h" -#include "chrome/common/l10n_util_win.h" namespace views { diff --git a/chrome/views/widget/tooltip_manager.cc b/chrome/views/widget/tooltip_manager.cc index dd63196..1584c29 100644 --- a/chrome/views/widget/tooltip_manager.cc +++ b/chrome/views/widget/tooltip_manager.cc @@ -6,10 +6,10 @@ #include <limits> +#include "app/l10n_util.h" +#include "app/l10n_util_win.h" #include "base/logging.h" #include "base/message_loop.h" -#include "chrome/common/l10n_util.h" -#include "chrome/common/l10n_util_win.h" #include "chrome/common/gfx/text_elider.h" #include "chrome/common/win_util.h" #include "chrome/views/view.h" diff --git a/chrome/views/window/dialog_client_view.cc b/chrome/views/window/dialog_client_view.cc index 13ee1f0..f60bd26 100644 --- a/chrome/views/window/dialog_client_view.cc +++ b/chrome/views/window/dialog_client_view.cc @@ -8,12 +8,12 @@ #include <uxtheme.h> #include <vsstyle.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_canvas.h" #include "chrome/common/gfx/chrome_font.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/win_util.h" #include "chrome/views/controls/button/native_button.h" #include "chrome/views/window/dialog_delegate.h" diff --git a/chrome/views/window/window_win.cc b/chrome/views/window/window_win.cc index 83e09e4..0057177 100644 --- a/chrome/views/window/window_win.cc +++ b/chrome/views/window/window_win.cc @@ -6,6 +6,7 @@ #include <shellapi.h> +#include "app/l10n_util.h" #include "app/resource_bundle.h" #include "base/win_util.h" #include "chrome/app/chrome_dll_resource.h" @@ -13,7 +14,6 @@ #include "chrome/common/gfx/chrome_font.h" #include "chrome/common/gfx/icon_util.h" #include "chrome/common/gfx/path.h" -#include "chrome/common/l10n_util.h" #include "chrome/common/notification_service.h" #include "chrome/common/pref_service.h" #include "chrome/common/win_util.h" diff --git a/webkit/default_plugin/plugin_impl_win.cc b/webkit/default_plugin/plugin_impl_win.cc index 70f9cfe..884f47d 100644 --- a/webkit/default_plugin/plugin_impl_win.cc +++ b/webkit/default_plugin/plugin_impl_win.cc @@ -399,10 +399,10 @@ LRESULT PluginInstallerImpl::OnEraseBackGround(UINT message, WPARAM wparam, // Use ICU in order to determine whether the locale is right-to-left. // // TODO(idana) bug# 1246452: there is already code in -// chrome/common/l10n_util.h/cc that uses ICU to determine the locale -// direction. We don't currently use this code since code in WebKit should not -// depend on code in Chrome. We can fix this by pulling (at least part of) the -// l10n_util functionality up into the Base module. +// app/l10n_util.h/cc that uses ICU to determine the locale direction. We don't +// currently use this code since code in WebKit should not depend on code in +// Chrome. We can fix this by pulling (at least part of) the l10n_util +// functionality up into the Base module. bool PluginInstallerImpl::IsRTLLayout() const { const Locale& locale = Locale::getDefault(); const char* lang = locale.getLanguage(); |