diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 23:30:17 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 23:30:17 +0000 |
| commit | c051a1b531d77e7d2eb3afd1dec67e13aab39154 (patch) | |
| tree | a6dcc2760d1cdc216a329298052723cb0e25e242 /views/controls/menu | |
| parent | 28df88370f358468bffa1e1f6bc43aa25c11e388 (diff) | |
| download | chromium_src-c051a1b531d77e7d2eb3afd1dec67e13aab39154.zip chromium_src-c051a1b531d77e7d2eb3afd1dec67e13aab39154.tar.gz chromium_src-c051a1b531d77e7d2eb3afd1dec67e13aab39154.tar.bz2 | |
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
Diffstat (limited to 'views/controls/menu')
| -rw-r--r-- | views/controls/menu/menu_config_win.cc | 2 | ||||
| -rw-r--r-- | views/controls/menu/menu_controller.cc | 2 | ||||
| -rw-r--r-- | views/controls/menu/menu_item_view.cc | 2 | ||||
| -rw-r--r-- | views/controls/menu/menu_win.cc | 4 | ||||
| -rw-r--r-- | views/controls/menu/native_menu_win.cc | 4 |
5 files changed, 7 insertions, 7 deletions
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" |
