diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 17:18:14 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 17:18:14 +0000 |
| commit | d57afa518d4ad5192b5a2d0f7227b2ddebd21ab9 (patch) | |
| tree | 0f26ebcbcb4708db3b4520ba46929bc6a3727d1d /views/controls/button | |
| parent | c999f81499325506e3be3e373b1637bc3d71e85e (diff) | |
| download | chromium_src-d57afa518d4ad5192b5a2d0f7227b2ddebd21ab9.zip chromium_src-d57afa518d4ad5192b5a2d0f7227b2ddebd21ab9.tar.gz chromium_src-d57afa518d4ad5192b5a2d0f7227b2ddebd21ab9.tar.bz2 | |
views: Move widget/ directory to ui/views.
BUG=104039
R=ben@chromium.org
Review URL: http://codereview.chromium.org/8598031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110949 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button')
| -rw-r--r-- | views/controls/button/button_dropdown.cc | 2 | ||||
| -rw-r--r-- | views/controls/button/custom_button.cc | 2 | ||||
| -rw-r--r-- | views/controls/button/menu_button.cc | 4 | ||||
| -rw-r--r-- | views/controls/button/radio_button.cc | 2 | ||||
| -rw-r--r-- | views/controls/button/text_button.cc | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc index f5477a5..7df2164 100644 --- a/views/controls/button/button_dropdown.cc +++ b/views/controls/button/button_dropdown.cc @@ -12,10 +12,10 @@ #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/models/menu_model.h" +#include "ui/views/widget/widget.h" #include "views/controls/menu/menu_item_view.h" #include "views/controls/menu/menu_model_adapter.h" #include "views/controls/menu/menu_runner.h" -#include "views/widget/widget.h" namespace views { diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc index fc0c6b4..a4233b9 100644 --- a/views/controls/button/custom_button.cc +++ b/views/controls/button/custom_button.cc @@ -8,7 +8,7 @@ #include "ui/base/animation/throb_animation.h" #include "ui/base/keycodes/keyboard_codes.h" #include "ui/gfx/screen.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace views { diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc index fc6afaa..0248aaf 100644 --- a/views/controls/button/menu_button.cc +++ b/views/controls/button/menu_button.cc @@ -14,10 +14,10 @@ #include "ui/gfx/canvas.h" #include "ui/gfx/screen.h" #include "ui/views/events/event.h" +#include "ui/views/widget/root_view.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/button.h" #include "views/controls/menu/view_menu_delegate.h" -#include "views/widget/root_view.h" -#include "views/widget/widget.h" using base::Time; using base::TimeDelta; diff --git a/views/controls/button/radio_button.cc b/views/controls/button/radio_button.cc index 170d010..8cd1c4a 100644 --- a/views/controls/button/radio_button.cc +++ b/views/controls/button/radio_button.cc @@ -6,7 +6,7 @@ #include "base/logging.h" #include "ui/base/accessibility/accessible_view_state.h" -#include "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace views { diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index 12f28f5..3456f84 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -12,8 +12,8 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas_skia.h" #include "ui/views/events/event.h" +#include "ui/views/widget/widget.h" #include "views/controls/button/button.h" -#include "views/widget/widget.h" #if defined(OS_WIN) #include "skia/ext/skia_utils_win.h" |