diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 02:09:58 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-22 02:09:58 +0000 |
| commit | c13be0d2381881a8ee2a90fecb8c74757972889c (patch) | |
| tree | 98f9808c5492cd76b79bfc8e80585be395830cbb /ui/views/focus | |
| parent | c0cfa519feb222571f5d046eb448aa422466bf45 (diff) | |
| download | chromium_src-c13be0d2381881a8ee2a90fecb8c74757972889c.zip chromium_src-c13be0d2381881a8ee2a90fecb8c74757972889c.tar.gz chromium_src-c13be0d2381881a8ee2a90fecb8c74757972889c.tar.bz2 | |
views: Move widget/ directory to ui/views.
BUG=104039
R=ben@chromium.org
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=110949
Review URL: http://codereview.chromium.org/8598031
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111077 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 f549b9c..f52a256 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 f923cd0..13c3081 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 "views/widget/widget.h" +#include "ui/views/widget/widget.h" namespace views { diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc index 268623b..1c98a12 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 a0420e9..46c629a 100644 --- a/ui/views/focus/focus_manager_unittest.cc +++ b/ui/views/focus/focus_manager_unittest.cc @@ -14,6 +14,9 @@ #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" @@ -28,9 +31,6 @@ #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" |