diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-28 01:32:00 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-28 01:32:00 +0000 |
| commit | 48977d584e9516d70222e5c9b62c01e3516b5283 (patch) | |
| tree | 92751c3d38a0db9ca1eb1b5eecf20ff7ab773a97 /views/controls/menu | |
| parent | 5b14c320879a30f95c2ba55b32b5ab55f56c43c4 (diff) | |
| download | chromium_src-48977d584e9516d70222e5c9b62c01e3516b5283.zip chromium_src-48977d584e9516d70222e5c9b62c01e3516b5283.tar.gz chromium_src-48977d584e9516d70222e5c9b62c01e3516b5283.tar.bz2 | |
views: Move button directory to ui/views/controls/.
BUG=104039
R=maruel@chromium.org
TBR=ben@chromium.org
Review URL: http://codereview.chromium.org/8716001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/menu')
| -rw-r--r-- | views/controls/menu/menu_controller.cc | 2 | ||||
| -rw-r--r-- | views/controls/menu/menu_item_view.cc | 4 | ||||
| -rw-r--r-- | views/controls/menu/menu_item_view_aura.cc | 2 | ||||
| -rw-r--r-- | views/controls/menu/menu_item_view_linux.cc | 2 | ||||
| -rw-r--r-- | views/controls/menu/menu_runner.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index 71960a85..74b7119 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -14,9 +14,9 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/screen.h" +#include "ui/views/controls/button/menu_button.h" #include "ui/views/widget/root_view.h" #include "ui/views/widget/widget.h" -#include "views/controls/button/menu_button.h" #include "views/controls/menu/menu_controller_delegate.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 c361648..4943691 100644 --- a/views/controls/menu/menu_item_view.cc +++ b/views/controls/menu/menu_item_view.cc @@ -12,8 +12,8 @@ #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/menu_model.h" #include "ui/gfx/canvas.h" -#include "views/controls/button/menu_button.h" -#include "views/controls/button/text_button.h" +#include "ui/views/controls/button/menu_button.h" +#include "ui/views/controls/button/text_button.h" #include "views/controls/menu/menu_config.h" #include "views/controls/menu/menu_controller.h" #include "views/controls/menu/menu_separator.h" diff --git a/views/controls/menu/menu_item_view_aura.cc b/views/controls/menu/menu_item_view_aura.cc index 3e8f1d9..6d6b4b1 100644 --- a/views/controls/menu/menu_item_view_aura.cc +++ b/views/controls/menu/menu_item_view_aura.cc @@ -10,7 +10,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/favicon_size.h" -#include "views/controls/button/text_button.h" +#include "ui/views/controls/button/text_button.h" #include "views/controls/menu/menu_config.h" #include "views/controls/menu/menu_image_util.h" #include "views/controls/menu/submenu_view.h" diff --git a/views/controls/menu/menu_item_view_linux.cc b/views/controls/menu/menu_item_view_linux.cc index cca0a35..8d13e56 100644 --- a/views/controls/menu/menu_item_view_linux.cc +++ b/views/controls/menu/menu_item_view_linux.cc @@ -10,7 +10,7 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/gfx/favicon_size.h" -#include "views/controls/button/text_button.h" +#include "ui/views/controls/button/text_button.h" #include "views/controls/menu/menu_config.h" #include "views/controls/menu/menu_image_util.h" #include "views/controls/menu/submenu_view.h" diff --git a/views/controls/menu/menu_runner.cc b/views/controls/menu/menu_runner.cc index 169be0b..e62d95c 100644 --- a/views/controls/menu/menu_runner.cc +++ b/views/controls/menu/menu_runner.cc @@ -6,7 +6,7 @@ #include <set> -#include "views/controls/button/menu_button.h" +#include "ui/views/controls/button/menu_button.h" #include "views/controls/menu/menu_controller.h" #include "views/controls/menu/menu_controller_delegate.h" #include "views/controls/menu/menu_delegate.h" |