Move l10n_util to ui/base

BUG=none
TEST=none
TBR=brettw


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72227 0039d316-1c4b-4281-b951-d872f2087c98

23 files changed, 28 insertions, 28 deletions

diff --git a/views/accelerator.cc b/views/accelerator.cc
index c9d4f39..e9c9345 100644
--- a/views/accelerator.cc
+++ b/views/accelerator.cc
@@ -10,12 +10,12 @@
 #include <gdk/gdk.h>
 #endif
 
-#include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
+#include "ui/base/l10n/l10n_util.h"
 
 namespace views {
 
diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc
index 74e598e..01d62e7 100644
--- a/views/controls/button/button_dropdown.cc
+++ b/views/controls/button/button_dropdown.cc
@@ -4,11 +4,11 @@
 
 #include "views/controls/button/button_dropdown.h"
 
-#include "app/l10n_util.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "views/controls/menu/view_menu_delegate.h"
 #include "views/widget/widget.h"
 
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index d7510c4..6564a23 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -4,12 +4,12 @@
 
 #include "views/controls/button/menu_button.h"
 
-#include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "grit/app_strings.h"
 #include "grit/app_resources.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/view_menu_delegate.h"
diff --git a/views/controls/label_unittest.cc b/views/controls/label_unittest.cc
index 44d101b..7a1bf05 100644
--- a/views/controls/label_unittest.cc
+++ b/views/controls/label_unittest.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "views/border.h"
 #include "views/controls/label.h"
 
diff --git a/views/controls/listbox/native_listbox_win.cc b/views/controls/listbox/native_listbox_win.cc
index a1a07b5..25a23d7 100644
--- a/views/controls/listbox/native_listbox_win.cc
+++ b/views/controls/listbox/native_listbox_win.cc
@@ -7,9 +7,9 @@
 #include <commctrl.h>
 #include <windowsx.h>
 
-#include "app/l10n_util_win.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/font.h"
+#include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/controls/listbox/listbox.h"
 #include "views/widget/widget.h"
diff --git a/views/controls/menu/menu_config_win.cc b/views/controls/menu/menu_config_win.cc
index 3882cb4..fbbaa37 100644
--- a/views/controls/menu/menu_config_win.cc
+++ b/views/controls/menu/menu_config_win.cc
@@ -8,10 +8,10 @@
 #include <uxtheme.h>
 #include <Vssym32.h>
 
-#include "app/l10n_util_win.h"
 #include "base/logging.h"
 #include "base/win/win_util.h"
 #include "gfx/native_theme_win.h"
+#include "ui/base/l10n/l10n_util_win.h"
 
 using gfx::NativeTheme;
 
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 83b5bdc..dbc31a4 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -4,13 +4,13 @@
 
 #include "views/controls/menu/menu_controller.h"
 
-#include "app/l10n_util.h"
 #include "base/i18n/rtl.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/controls/menu/submenu_view.h"
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index b5c1ced..bbbc9b7 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -4,10 +4,10 @@
 
 #include "views/controls/menu/menu_item_view.h"
 
-#include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "grit/app_strings.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/button/menu_button.h"
diff --git a/views/controls/menu/menu_win.cc b/views/controls/menu/menu_win.cc
index c99b91c..797489c 100644
--- a/views/controls/menu/menu_win.cc
+++ b/views/controls/menu/menu_win.cc
@@ -6,8 +6,6 @@
 
 #include <string>
 
-#include "app/l10n_util.h"
-#include "app/l10n_util_win.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "base/string_util.h"
@@ -15,6 +13,8 @@
 #include "gfx/font.h"
 #include "gfx/rect.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/win/window_impl.h"
 #include "views/accelerator.h"
 
diff --git a/views/controls/menu/native_menu_win.cc b/views/controls/menu/native_menu_win.cc
index 0cf6757..fab94b2 100644
--- a/views/controls/menu/native_menu_win.cc
+++ b/views/controls/menu/native_menu_win.cc
@@ -4,8 +4,6 @@
 
 #include "views/controls/menu/native_menu_win.h"
 
-#include "app/l10n_util.h"
-#include "app/l10n_util_win.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/stl_util-inl.h"
@@ -14,6 +12,8 @@
 #include "gfx/font.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/win/hwnd_util.h"
 #include "views/accelerator.h"
 #include "views/controls/menu/menu_2.h"
diff --git a/views/controls/native_control.cc b/views/controls/native_control.cc
index 01cbb15..3c303c2 100644
--- a/views/controls/native_control.cc
+++ b/views/controls/native_control.cc
@@ -10,12 +10,12 @@
 #include <atlframe.h>
 #include <atlmisc.h>
 
-#include "app/l10n_util_win.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
 #include "gfx/native_theme_win.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
+#include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
 #include "views/background.h"
diff --git a/views/controls/native_control_win.cc b/views/controls/native_control_win.cc
index af27b4c..b81b2ea 100644
--- a/views/controls/native_control_win.cc
+++ b/views/controls/native_control_win.cc
@@ -6,8 +6,8 @@
 
 #include <windowsx.h>
 
-#include "app/l10n_util_win.h"
 #include "base/logging.h"
+#include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/view_prop.h"
 #include "ui/base/win/hwnd_util.h"
 #include "views/focus/focus_manager.h"
diff --git a/views/controls/scrollbar/bitmap_scroll_bar.cc b/views/controls/scrollbar/bitmap_scroll_bar.cc
index 5a426e1..e7e32c8 100644
--- a/views/controls/scrollbar/bitmap_scroll_bar.cc
+++ b/views/controls/scrollbar/bitmap_scroll_bar.cc
@@ -8,7 +8,6 @@
 #include "views/screen.h"
 #endif
 
-#include "app/l10n_util.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
@@ -18,6 +17,7 @@
 #include "grit/app_strings.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "views/controls/menu/menu.h"
 #include "views/controls/scroll_view.h"
 #include "views/widget/widget.h"
diff --git a/views/controls/tabbed_pane/native_tabbed_pane_win.cc b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
index ed97ea2..cc81ba6 100644
--- a/views/controls/tabbed_pane/native_tabbed_pane_win.cc
+++ b/views/controls/tabbed_pane/native_tabbed_pane_win.cc
@@ -6,12 +6,12 @@
 
 #include <vssym32.h>
 
-#include "app/l10n_util_win.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "gfx/native_theme_win.h"
+#include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/fill_layout.h"
diff --git a/views/controls/table/native_table_win.cc b/views/controls/table/native_table_win.cc
index 86d4287..a0291bb 100644
--- a/views/controls/table/native_table_win.cc
+++ b/views/controls/table/native_table_win.cc
@@ -7,13 +7,13 @@
 #include <commctrl.h>
 #include <windowsx.h>
 
-#include "app/l10n_util.h"
-#include "app/l10n_util_win.h"
 #include "base/logging.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/favicon_size.h"
 #include "gfx/icon_util.h"
 #include "skia/ext/skia_utils_win.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/models/table_model.h"
 #include "ui/base/win/hwnd_util.h"
 #include "views/controls/table/table_view2.h"
diff --git a/views/controls/table/table_view.cc b/views/controls/table/table_view.cc
index 940ca36..4bfd7749 100644
--- a/views/controls/table/table_view.cc
+++ b/views/controls/table/table_view.cc
@@ -9,8 +9,6 @@
 
 #include <algorithm>
 
-#include "app/l10n_util.h"
-#include "app/l10n_util_win.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
 #include "gfx/canvas_skia.h"
@@ -20,6 +18,8 @@
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/models/table_model.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/hwnd_util.h"
diff --git a/views/controls/textfield/native_textfield_win.cc b/views/controls/textfield/native_textfield_win.cc
index 7c074d9..ecdb38f 100644
--- a/views/controls/textfield/native_textfield_win.cc
+++ b/views/controls/textfield/native_textfield_win.cc
@@ -6,8 +6,6 @@
 
 #include <algorithm>
 
-#include "app/l10n_util.h"
-#include "app/l10n_util_win.h"
 #include "app/win/win_util.h"
 #include "base/i18n/rtl.h"
 #include "base/string_util.h"
@@ -20,6 +18,8 @@
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
+#include "ui/base/l10n/l10n_util.h"
+#include "ui/base/l10n/l10n_util_win.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_win.h"
 #include "views/controls/menu/menu_2.h"
diff --git a/views/controls/tree/tree_view.cc b/views/controls/tree/tree_view.cc
index 2f77449..3d81015 100644
--- a/views/controls/tree/tree_view.cc
+++ b/views/controls/tree/tree_view.cc
@@ -6,7 +6,6 @@
 
 #include <vector>
 
-#include "app/l10n_util_win.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
@@ -21,6 +20,7 @@
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/win/hwnd_util.h"
+#include "ui/base/l10n/l10n_util_win.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
diff --git a/views/widget/aero_tooltip_manager.cc b/views/widget/aero_tooltip_manager.cc
index 138ff53..c704a58 100644
--- a/views/widget/aero_tooltip_manager.cc
+++ b/views/widget/aero_tooltip_manager.cc
@@ -8,9 +8,9 @@
 #include <commctrl.h>
 #include <shlobj.h>
 
-#include "app/l10n_util_win.h"
 #include "base/message_loop.h"
 #include "gfx/point.h"
+#include "ui/base/l10n/l10n_util_win.h"
 
 namespace views {
 
diff --git a/views/widget/tooltip_manager_win.cc b/views/widget/tooltip_manager_win.cc
index 04e990b..0ea8187 100644
--- a/views/widget/tooltip_manager_win.cc
+++ b/views/widget/tooltip_manager_win.cc
@@ -7,12 +7,12 @@
 #include <windowsx.h>
 #include <limits>
 
-#include "app/l10n_util_win.h"
 #include "app/win/win_util.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "gfx/font.h"
+#include "ui/base/l10n/l10n_util_win.h"
 #include "views/screen.h"
 #include "views/view.h"
 #include "views/widget/root_view.h"
diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index 3696441..1fd9dbd 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -4,13 +4,13 @@
 
 #include "views/widget/widget_win.h"
 
-#include "app/l10n_util_win.h"
 #include "app/win/win_util.h"
 #include "base/string_util.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/native_theme_win.h"
 #include "gfx/path.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
+#include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/system_monitor/system_monitor.h"
 #include "ui/base/theme_provider.h"
 #include "ui/base/view_prop.h"
diff --git a/views/window/custom_frame_view.cc b/views/window/custom_frame_view.cc
index 310f940..fe2fc30 100644
--- a/views/window/custom_frame_view.cc
+++ b/views/window/custom_frame_view.cc
@@ -4,13 +4,13 @@
 
 #include "views/window/custom_frame_view.h"
 
-#include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas.h"
 #include "gfx/font.h"
 #include "gfx/path.h"
 #include "grit/app_resources.h"
 #include "grit/app_strings.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/window/client_view.h"
 #include "views/window/window_shape.h"
diff --git a/views/window/dialog_client_view.cc b/views/window/dialog_client_view.cc
index 3947949..d39acec 100644
--- a/views/window/dialog_client_view.cc
+++ b/views/window/dialog_client_view.cc
@@ -14,12 +14,12 @@
 
 #include <algorithm>
 
-#include "app/l10n_util.h"
 #include "base/utf_string_conversions.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "grit/app_strings.h"
 #include "ui/base/keycodes/keyboard_codes.h"
+#include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "views/controls/button/native_button.h"
 #include "views/standard_layout.h"