diff options
author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 23:19:46 +0000 |
---|---|---|
committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-20 23:19:46 +0000 |
commit | 42ce29d4f464b36ddaebefb6d6c33e7418e93141 (patch) | |
tree | 0d0a4965d61ef1514dee70c9f2507529d8c5b178 /views/controls/button | |
parent | 0ffeb598304f119e2d3df70d47a592d2dbc722da (diff) | |
download | chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.zip chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.tar.gz chromium_src-42ce29d4f464b36ddaebefb6d6c33e7418e93141.tar.bz2 |
Move ResourceBundle, DataPack to ui/base
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6263008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72038 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button')
-rw-r--r-- | views/controls/button/menu_button.cc | 2 | ||||
-rw-r--r-- | views/controls/button/text_button.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index 10220d5..d7510c4 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -5,12 +5,12 @@ #include "views/controls/button/menu_button.h" #include "app/l10n_util.h" -#include "app/resource_bundle.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/resource/resource_bundle.h" #include "views/controls/button/button.h" #include "views/controls/menu/view_menu_delegate.h" #include "views/event.h" diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index 1216be0..fd52f72 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -6,11 +6,11 @@ #include <algorithm> -#include "app/resource_bundle.h" #include "base/logging.h" #include "base/utf_string_conversions.h" #include "gfx/canvas_skia.h" #include "ui/base/animation/throb_animation.h" +#include "ui/base/resource/resource_bundle.h" #include "views/controls/button/button.h" #include "views/event.h" #include "grit/app_resources.h" |