diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 18:00:32 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-21 18:00:32 +0000 |
| commit | 79f06c737237ce41274a3e528a500c9a7fb48ae3 (patch) | |
| tree | 16c6291a61b658c15ecda8fff6e8e4c701c119fc /ui/views/focus | |
| parent | ec77efa8699c028cc8a1712c75b68be28833b3bf (diff) | |
| download | chromium_src-79f06c737237ce41274a3e528a500c9a7fb48ae3.zip chromium_src-79f06c737237ce41274a3e528a500c9a7fb48ae3.tar.gz chromium_src-79f06c737237ce41274a3e528a500c9a7fb48ae3.tar.bz2 | |
Revert 110949 - views: Move widget/ directory to ui/views.
BUG=104039
R=ben@chromium.org
Review URL: http://codereview.chromium.org/8598031
TBR=tfarina@chromium.org
Review URL: http://codereview.chromium.org/8547015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110953 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/focus')
| -rw-r--r-- | ui/views/focus/accelerator_handler_gtk_unittest.cc | 4 | ||||
| -rw-r--r-- | ui/views/focus/accelerator_handler_win.cc | 2 | ||||
| -rw-r--r-- | ui/views/focus/focus_manager.cc | 4 | ||||
| -rw-r--r-- | ui/views/focus/focus_manager_unittest.cc | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/ui/views/focus/accelerator_handler_gtk_unittest.cc b/ui/views/focus/accelerator_handler_gtk_unittest.cc index f52a256..f549b9c 100644 --- a/ui/views/focus/accelerator_handler_gtk_unittest.cc +++ b/ui/views/focus/accelerator_handler_gtk_unittest.cc @@ -9,9 +9,9 @@ #include "ui/gfx/rect.h" #include "ui/views/focus/accelerator_handler.h" #include "ui/views/focus/focus_manager.h" -#include "ui/views/widget/widget.h" -#include "ui/views/widget/widget_delegate.h" #include "views/view.h" +#include "views/widget/widget.h" +#include "views/widget/widget_delegate.h" namespace views { diff --git a/ui/views/focus/accelerator_handler_win.cc b/ui/views/focus/accelerator_handler_win.cc index 13c3081..f923cd0 100644 --- a/ui/views/focus/accelerator_handler_win.cc +++ b/ui/views/focus/accelerator_handler_win.cc @@ -8,7 +8,7 @@ #include "ui/base/keycodes/keyboard_codes.h" #include "ui/views/events/event.h" #include "ui/views/focus/focus_manager.h" -#include "ui/views/widget/widget.h" +#include "views/widget/widget.h" namespace views { diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc index 1c98a12..268623b 100644 --- a/ui/views/focus/focus_manager.cc +++ b/ui/views/focus/focus_manager.cc @@ -15,9 +15,9 @@ #include "ui/views/focus/focus_search.h" #include "ui/views/focus/view_storage.h" #include "ui/views/focus/widget_focus_manager.h" -#include "ui/views/widget/root_view.h" -#include "ui/views/widget/widget.h" #include "views/view.h" +#include "views/widget/root_view.h" +#include "views/widget/widget.h" namespace views { diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc index 46c629a..a0420e9 100644 --- a/ui/views/focus/focus_manager_unittest.cc +++ b/ui/views/focus/focus_manager_unittest.cc @@ -14,9 +14,6 @@ #include "ui/views/focus/accelerator_handler.h" #include "ui/views/focus/focus_manager_factory.h" #include "ui/views/test/views_test_base.h" -#include "ui/views/widget/root_view.h" -#include "ui/views/widget/widget.h" -#include "ui/views/widget/widget_delegate.h" #include "ui/views/window/non_client_view.h" #include "views/background.h" #include "views/border.h" @@ -31,6 +28,9 @@ #include "views/controls/tabbed_pane/native_tabbed_pane_wrapper.h" #include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/controls/textfield/textfield.h" +#include "views/widget/root_view.h" +#include "views/widget/widget.h" +#include "views/widget/widget_delegate.h" #if defined(OS_LINUX) #include "ui/base/keycodes/keyboard_code_conversion_gtk.h" |