views: Delete bubble, events, focus, layout directories and its stubbed files.

BUG=104039
R=ben@chromium.org

Review URL: http://codereview.chromium.org/8566052

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110787 0039d316-1c4b-4281-b951-d872f2087c98

76 files changed, 111 insertions, 109 deletions

diff --git a/ui/aura_shell/drag_drop_controller_unittest.cc b/ui/aura_shell/drag_drop_controller_unittest.cc
index ad87b3d..36d3170 100644
--- a/ui/aura_shell/drag_drop_controller_unittest.cc
+++ b/ui/aura_shell/drag_drop_controller_unittest.cc
@@ -11,9 +11,9 @@
 #include "ui/aura/event.h"
 #include "ui/aura_shell/desktop_event_filter.h"
 #include "ui/aura_shell/test/aura_shell_test_base.h"
-#include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
-#include "views/events/event.h"
+#include "ui/base/dragdrop/os_exchange_data.h"
+#include "ui/views/events/event.h"
 #include "views/view.h"
 #include "views/widget/widget.h"
 
diff --git a/ui/aura_shell/examples/bubble.cc b/ui/aura_shell/examples/bubble.cc
index ff0e7a1..03cdfc1 100644
--- a/ui/aura_shell/examples/bubble.cc
+++ b/ui/aura_shell/examples/bubble.cc
@@ -3,10 +3,10 @@
 // found in the LICENSE file.
 
 #include "base/utf_string_conversions.h"
-#include "views/bubble/bubble_border.h"
-#include "views/bubble/bubble_delegate.h"
+#include "ui/views/bubble/bubble_border.h"
+#include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/layout/fill_layout.h"
 #include "views/controls/label.h"
-#include "views/layout/fill_layout.h"
 #include "views/widget/widget.h"
 
 namespace aura_shell {
diff --git a/ui/views/bubble/border_contents_view.cc b/ui/views/bubble/border_contents_view.cc
index 67c893a..afa82fe 100644
--- a/ui/views/bubble/border_contents_view.cc
+++ b/ui/views/bubble/border_contents_view.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/bubble/border_contents_view.h"
+#include "ui/views/bubble/border_contents_view.h"
 
 #include <algorithm>
 
diff --git a/ui/views/bubble/border_contents_view.h b/ui/views/bubble/border_contents_view.h
index 696dd26..e30ba19 100644
--- a/ui/views/bubble/border_contents_view.h
+++ b/ui/views/bubble/border_contents_view.h
@@ -6,8 +6,8 @@
 #define UI_VIEWS_BUBBLE_BORDER_CONTENTS_VIEW_H_
 #pragma once
 
-#include "views/bubble/bubble_border.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "ui/views/bubble/bubble_border.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/ui/views/bubble/bubble_border.cc b/ui/views/bubble/bubble_border.cc
index 368b0be..2538b73 100644
--- a/ui/views/bubble/bubble_border.cc
+++ b/ui/views/bubble/bubble_border.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/bubble/bubble_border.h"
+#include "ui/views/bubble/bubble_border.h"
 
 #include <algorithm>  // for std::max
 
diff --git a/ui/views/bubble/bubble_delegate.cc b/ui/views/bubble/bubble_delegate.cc
index b3baea4..bffe755 100644
--- a/ui/views/bubble/bubble_delegate.cc
+++ b/ui/views/bubble/bubble_delegate.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/bubble/bubble_delegate.h"
+#include "ui/views/bubble/bubble_delegate.h"
 
 #include "ui/base/animation/slide_animation.h"
-#include "views/bubble/bubble_frame_view.h"
+#include "ui/views/bubble/bubble_frame_view.h"
 #include "views/widget/widget.h"
 
 // The duration of the fade animation in milliseconds.
diff --git a/ui/views/bubble/bubble_delegate.h b/ui/views/bubble/bubble_delegate.h
index a21bfab..a2654e1 100644
--- a/ui/views/bubble/bubble_delegate.h
+++ b/ui/views/bubble/bubble_delegate.h
@@ -8,7 +8,7 @@
 
 #include "base/gtest_prod_util.h"
 #include "ui/base/animation/animation_delegate.h"
-#include "views/bubble/bubble_border.h"
+#include "ui/views/bubble/bubble_border.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_delegate.h"
 
diff --git a/ui/views/bubble/bubble_delegate_unittest.cc b/ui/views/bubble/bubble_delegate_unittest.cc
index f6d256a..6e61b5e 100644
--- a/ui/views/bubble/bubble_delegate_unittest.cc
+++ b/ui/views/bubble/bubble_delegate_unittest.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/test/views_test_base.h"
-#include "views/bubble/bubble_delegate.h"
-#include "views/bubble/bubble_frame_view.h"
 #include "views/widget/widget.h"
 
 namespace views {
diff --git a/ui/views/bubble/bubble_frame_view.cc b/ui/views/bubble/bubble_frame_view.cc
index 85e1f6e..cc35496 100644
--- a/ui/views/bubble/bubble_frame_view.cc
+++ b/ui/views/bubble/bubble_frame_view.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/bubble/bubble_frame_view.h"
+#include "ui/views/bubble/bubble_frame_view.h"
 
 #include <algorithm>
 
+#include "ui/views/bubble/border_contents_view.h"
+#include "ui/views/bubble/bubble_border.h"
+#include "ui/views/layout/fill_layout.h"
 #include "ui/views/window/client_view.h"
-#include "views/bubble/border_contents_view.h"
-#include "views/bubble/bubble_border.h"
-#include "views/layout/fill_layout.h"
 #include "views/widget/widget.h"
 
 namespace views {
diff --git a/ui/views/bubble/bubble_frame_view.h b/ui/views/bubble/bubble_frame_view.h
index f134725..e3aca58 100644
--- a/ui/views/bubble/bubble_frame_view.h
+++ b/ui/views/bubble/bubble_frame_view.h
@@ -7,8 +7,8 @@
 #pragma once
 
 #include "base/gtest_prod_util.h"
+#include "ui/views/bubble/bubble_border.h"
 #include "ui/views/window/non_client_view.h"
-#include "views/bubble/bubble_border.h"
 
 namespace views {
 
diff --git a/ui/views/bubble/bubble_frame_view_unittest.cc b/ui/views/bubble/bubble_frame_view_unittest.cc
index 6699bfd..bde9f7c 100644
--- a/ui/views/bubble/bubble_frame_view_unittest.cc
+++ b/ui/views/bubble/bubble_frame_view_unittest.cc
@@ -3,11 +3,11 @@
 // found in the LICENSE file.
 
 #include "ui/base/hit_test.h"
+#include "ui/views/bubble/border_contents_view.h"
+#include "ui/views/bubble/bubble_border.h"
+#include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/bubble/bubble_frame_view.h"
 #include "ui/views/test/views_test_base.h"
-#include "views/bubble/border_contents_view.h"
-#include "views/bubble/bubble_border.h"
-#include "views/bubble/bubble_delegate.h"
-#include "views/bubble/bubble_frame_view.h"
 #include "views/widget/widget.h"
 
 namespace views {
diff --git a/ui/views/desktop/desktop_main.cc b/ui/views/desktop/desktop_main.cc
index 96a56fa..9fed7a0 100644
--- a/ui/views/desktop/desktop_main.cc
+++ b/ui/views/desktop/desktop_main.cc
@@ -11,7 +11,7 @@
 #include "ui/base/ui_base_paths.h"
 #include "ui/views/desktop/desktop_views_delegate.h"
 #include "ui/views/desktop/desktop_window_view.h"
-#include "views/focus/accelerator_handler.h"
+#include "ui/views/focus/accelerator_handler.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
diff --git a/ui/views/desktop/desktop_window_manager.cc b/ui/views/desktop/desktop_window_manager.cc
index d812359..0275673 100644
--- a/ui/views/desktop/desktop_window_manager.cc
+++ b/ui/views/desktop/desktop_window_manager.cc
@@ -7,8 +7,8 @@
 #include "ui/base/hit_test.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
+#include "ui/views/events/event.h"
 #include "ui/views/window/non_client_view.h"
-#include "views/events/event.h"
 #include "views/widget/native_widget_private.h"
 #include "views/widget/native_widget_view.h"
 #include "views/widget/native_widget_views.h"
diff --git a/ui/views/events/event.cc b/ui/views/events/event.cc
index 67d165e..433098e 100644
--- a/ui/views/events/event.cc
+++ b/ui/views/events/event.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/events/event.h"
+#include "ui/views/events/event.h"
 
 #include "base/logging.h"
 #include "ui/base/keycodes/keyboard_code_conversion.h"
diff --git a/ui/views/events/event_aura.cc b/ui/views/events/event_aura.cc
index a4d3169..39ae3f7 100644
--- a/ui/views/events/event_aura.cc
+++ b/ui/views/events/event_aura.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/events/event.h"
+#include "ui/views/events/event.h"
 
 #include "base/logging.h"
 #include "ui/aura/event.h"
diff --git a/ui/views/events/event_gtk.cc b/ui/views/events/event_gtk.cc
index fb0c88a..7c67134 100644
--- a/ui/views/events/event_gtk.cc
+++ b/ui/views/events/event_gtk.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/events/event.h"
+#include "ui/views/events/event.h"
 
 #include <gdk/gdk.h>
 
diff --git a/ui/views/events/event_unittest.cc b/ui/views/events/event_unittest.cc
index 211877d..867a9a4 100644
--- a/ui/views/events/event_unittest.cc
+++ b/ui/views/events/event_unittest.cc
@@ -5,7 +5,7 @@
 #include "testing/gtest/include/gtest/gtest.h"
 
 #include "base/basictypes.h"
-#include "views/events/event.h"
+#include "ui/views/events/event.h"
 
 // Bug 99129.
 #if defined(USE_AURA)
diff --git a/ui/views/events/event_wayland.cc b/ui/views/events/event_wayland.cc
index 44998e6..be248d1 100644
--- a/ui/views/events/event_wayland.cc
+++ b/ui/views/events/event_wayland.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/events/event.h"
+#include "ui/views/events/event.h"
 
 #include "base/logging.h"
 #include "ui/base/keycodes/keyboard_code_conversion.h"
diff --git a/ui/views/events/event_win.cc b/ui/views/events/event_win.cc
index 03b855e..82a83ed 100644
--- a/ui/views/events/event_win.cc
+++ b/ui/views/events/event_win.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/events/event.h"
+#include "ui/views/events/event.h"
 
 #include "base/logging.h"
 #include "ui/base/keycodes/keyboard_code_conversion.h"
diff --git a/ui/views/events/event_x.cc b/ui/views/events/event_x.cc
index 1c9e330..48e7bea 100644
--- a/ui/views/events/event_x.cc
+++ b/ui/views/events/event_x.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/events/event.h"
+#include "ui/views/events/event.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
diff --git a/ui/views/examples/bubble_example.cc b/ui/views/examples/bubble_example.cc
index 38a3529..70b4357 100644
--- a/ui/views/examples/bubble_example.cc
+++ b/ui/views/examples/bubble_example.cc
@@ -5,11 +5,11 @@
 #include "ui/views/examples/bubble_example.h"
 
 #include "base/utf_string_conversions.h"
-#include "views/bubble/bubble_delegate.h"
+#include "ui/views/bubble/bubble_delegate.h"
+#include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/fill_layout.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
-#include "views/layout/box_layout.h"
-#include "views/layout/fill_layout.h"
 #include "views/widget/widget.h"
 
 namespace examples {
diff --git a/ui/views/examples/button_example.cc b/ui/views/examples/button_example.cc
index f3f1c1f..4ef0534 100644
--- a/ui/views/examples/button_example.cc
+++ b/ui/views/examples/button_example.cc
@@ -7,8 +7,8 @@
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
+#include "ui/views/layout/fill_layout.h"
 #include "views/controls/button/checkbox.h"
-#include "views/layout/fill_layout.h"
 #include "views/view.h"
 
 namespace examples {
diff --git a/ui/views/examples/combobox_example.cc b/ui/views/examples/combobox_example.cc
index 8e41311..016ae6a 100644
--- a/ui/views/examples/combobox_example.cc
+++ b/ui/views/examples/combobox_example.cc
@@ -7,7 +7,7 @@
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/combobox_model.h"
-#include "views/layout/fill_layout.h"
+#include "ui/views/layout/fill_layout.h"
 
 namespace {
 
diff --git a/ui/views/examples/double_split_view_example.cc b/ui/views/examples/double_split_view_example.cc
index bd7d756..e2a43bc 100644
--- a/ui/views/examples/double_split_view_example.cc
+++ b/ui/views/examples/double_split_view_example.cc
@@ -4,8 +4,8 @@
 
 #include "ui/views/examples/double_split_view_example.h"
 
+#include "ui/views/layout/grid_layout.h"
 #include "views/controls/single_split_view.h"
-#include "views/layout/grid_layout.h"
 
 namespace {
 
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index 6718d78..1205196 100644
--- a/ui/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -32,12 +32,12 @@
 #include "ui/views/examples/textfield_example.h"
 #include "ui/views/examples/throbber_example.h"
 #include "ui/views/examples/widget_example.h"
+#include "ui/views/focus/accelerator_handler.h"
+#include "ui/views/layout/grid_layout.h"
 #include "ui/views/test/test_views_delegate.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
-#include "views/focus/accelerator_handler.h"
-#include "views/layout/grid_layout.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
diff --git a/ui/views/examples/link_example.cc b/ui/views/examples/link_example.cc
index 7b81d88..69731ad 100644
--- a/ui/views/examples/link_example.cc
+++ b/ui/views/examples/link_example.cc
@@ -5,8 +5,8 @@
 #include "ui/views/examples/link_example.h"
 
 #include "base/utf_string_conversions.h"
+#include "ui/views/layout/fill_layout.h"
 #include "views/controls/link.h"
-#include "views/layout/fill_layout.h"
 #include "views/view.h"
 
 namespace examples {
diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc
index 15bfc0d..54346a2 100644
--- a/ui/views/examples/menu_example.cc
+++ b/ui/views/examples/menu_example.cc
@@ -8,11 +8,11 @@
 
 #include "base/utf_string_conversions.h"
 #include "ui/base/models/simple_menu_model.h"
+#include "ui/views/layout/fill_layout.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/menu/view_menu_delegate.h"
-#include "views/layout/fill_layout.h"
 #include "views/view.h"
 
 namespace {
diff --git a/ui/views/examples/message_box_example.cc b/ui/views/examples/message_box_example.cc
index 5da917f..89d4a6c 100644
--- a/ui/views/examples/message_box_example.cc
+++ b/ui/views/examples/message_box_example.cc
@@ -5,8 +5,8 @@
 #include "ui/views/examples/message_box_example.h"
 
 #include "base/utf_string_conversions.h"
+#include "ui/views/layout/grid_layout.h"
 #include "views/controls/message_box_view.h"
-#include "views/layout/grid_layout.h"
 #include "views/view.h"
 
 namespace examples {
diff --git a/ui/views/examples/native_theme_button_example.cc b/ui/views/examples/native_theme_button_example.cc
index e11bfcd..d9350ed 100644
--- a/ui/views/examples/native_theme_button_example.cc
+++ b/ui/views/examples/native_theme_button_example.cc
@@ -13,8 +13,8 @@
 #include "ui/base/models/combobox_model.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/examples/example_combobox_model.h"
+#include "ui/views/layout/grid_layout.h"
 #include "views/controls/label.h"
-#include "views/layout/grid_layout.h"
 #include "views/native_theme_painter.h"
 
 namespace {
diff --git a/ui/views/examples/native_theme_checkbox_example.cc b/ui/views/examples/native_theme_checkbox_example.cc
index 8c2bb55..6df2056 100644
--- a/ui/views/examples/native_theme_checkbox_example.cc
+++ b/ui/views/examples/native_theme_checkbox_example.cc
@@ -6,9 +6,9 @@
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "ui/views/layout/fill_layout.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/button/radio_button.h"
-#include "views/layout/fill_layout.h"
 
 namespace examples {
 
diff --git a/ui/views/examples/progress_bar_example.cc b/ui/views/examples/progress_bar_example.cc
index 5fabe7a..14776d5 100644
--- a/ui/views/examples/progress_bar_example.cc
+++ b/ui/views/examples/progress_bar_example.cc
@@ -5,9 +5,9 @@
 #include "ui/views/examples/progress_bar_example.h"
 
 #include "base/utf_string_conversions.h"
+#include "ui/views/layout/grid_layout.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/progress_bar.h"
-#include "views/layout/grid_layout.h"
 #include "views/view.h"
 
 namespace {
diff --git a/ui/views/examples/radio_button_example.cc b/ui/views/examples/radio_button_example.cc
index 6450248..f501fec 100644
--- a/ui/views/examples/radio_button_example.cc
+++ b/ui/views/examples/radio_button_example.cc
@@ -6,8 +6,8 @@
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "ui/views/layout/grid_layout.h"
 #include "views/controls/button/text_button.h"
-#include "views/layout/grid_layout.h"
 #include "views/view.h"
 
 namespace examples {
diff --git a/ui/views/examples/scroll_view_example.cc b/ui/views/examples/scroll_view_example.cc
index ddd9af9..d085c57 100644
--- a/ui/views/examples/scroll_view_example.cc
+++ b/ui/views/examples/scroll_view_example.cc
@@ -6,8 +6,8 @@
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
+#include "ui/views/layout/grid_layout.h"
 #include "views/controls/button/radio_button.h"
-#include "views/layout/grid_layout.h"
 #include "views/view.h"
 
 namespace examples {
diff --git a/ui/views/examples/single_split_view_example.cc b/ui/views/examples/single_split_view_example.cc
index df57373..9f0f7f1 100644
--- a/ui/views/examples/single_split_view_example.cc
+++ b/ui/views/examples/single_split_view_example.cc
@@ -4,8 +4,8 @@
 
 #include "ui/views/examples/single_split_view_example.h"
 
+#include "ui/views/layout/grid_layout.h"
 #include "views/controls/single_split_view.h"
-#include "views/layout/grid_layout.h"
 
 namespace {
 
diff --git a/ui/views/examples/tabbed_pane_example.cc b/ui/views/examples/tabbed_pane_example.cc
index 5016e53b..03a7e32 100644
--- a/ui/views/examples/tabbed_pane_example.cc
+++ b/ui/views/examples/tabbed_pane_example.cc
@@ -5,8 +5,8 @@
 #include "ui/views/examples/tabbed_pane_example.h"
 
 #include "base/utf_string_conversions.h"
+#include "ui/views/layout/grid_layout.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
-#include "views/layout/grid_layout.h"
 
 namespace examples {
 
diff --git a/ui/views/examples/table2_example.cc b/ui/views/examples/table2_example.cc
index 4ee46b8..f60b097 100644
--- a/ui/views/examples/table2_example.cc
+++ b/ui/views/examples/table2_example.cc
@@ -6,9 +6,9 @@
 
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/views/layout/grid_layout.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/table/table_view2.h"
-#include "views/layout/grid_layout.h"
 
 namespace examples {
 
diff --git a/ui/views/examples/table_example.cc b/ui/views/examples/table_example.cc
index 06671d4..7073ad3 100644
--- a/ui/views/examples/table_example.cc
+++ b/ui/views/examples/table_example.cc
@@ -8,8 +8,8 @@
 
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
+#include "ui/views/layout/grid_layout.h"
 #include "views/controls/button/checkbox.h"
-#include "views/layout/grid_layout.h"
 
 namespace examples {
 
diff --git a/ui/views/examples/text_example.cc b/ui/views/examples/text_example.cc
index 3b7c82d..baa7f33 100644
--- a/ui/views/examples/text_example.cc
+++ b/ui/views/examples/text_example.cc
@@ -9,9 +9,9 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/views/examples/example_combobox_model.h"
+#include "ui/views/layout/grid_layout.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/label.h"
-#include "views/layout/grid_layout.h"
 #include "views/view.h"
 
 namespace {
diff --git a/ui/views/examples/textfield_example.cc b/ui/views/examples/textfield_example.cc
index f9536e5..d4ad38e 100644
--- a/ui/views/examples/textfield_example.cc
+++ b/ui/views/examples/textfield_example.cc
@@ -7,9 +7,9 @@
 #include "base/utf_string_conversions.h"
 #include "ui/base/range/range.h"
 #include "ui/gfx/render_text.h"
+#include "ui/views/layout/grid_layout.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
-#include "views/layout/grid_layout.h"
 #include "views/view.h"
 
 namespace examples {
diff --git a/ui/views/examples/throbber_example.cc b/ui/views/examples/throbber_example.cc
index dbba597..2f4e673 100644
--- a/ui/views/examples/throbber_example.cc
+++ b/ui/views/examples/throbber_example.cc
@@ -4,8 +4,8 @@
 
 #include "ui/views/examples/throbber_example.h"
 
+#include "ui/views/layout/fill_layout.h"
 #include "views/controls/throbber.h"
-#include "views/layout/fill_layout.h"
 #include "views/view.h"
 
 namespace {
diff --git a/ui/views/examples/widget_example.cc b/ui/views/examples/widget_example.cc
index 07844a0..e1d542e 100644
--- a/ui/views/examples/widget_example.cc
+++ b/ui/views/examples/widget_example.cc
@@ -5,9 +5,9 @@
 #include "ui/views/examples/widget_example.h"
 
 #include "base/utf_string_conversions.h"
+#include "ui/views/layout/box_layout.h"
+#include "ui/views/layout/layout_manager.h"
 #include "views/controls/button/text_button.h"
-#include "views/layout/box_layout.h"
-#include "views/layout/layout_manager.h"
 #include "views/view.h"
 #include "views/widget/widget.h"
 
diff --git a/ui/views/focus/OWNERS b/ui/views/focus/OWNERS
new file mode 100644
index 0000000..ed994c6
--- /dev/null
+++ b/ui/views/focus/OWNERS
@@ -0,0 +1 @@
+jcivelli@chromium.org

diff --git a/ui/views/focus/accelerator_handler_aura.cc b/ui/views/focus/accelerator_handler_aura.cc
index ab552899..274de1e 100644
--- a/ui/views/focus/accelerator_handler_aura.cc
+++ b/ui/views/focus/accelerator_handler_aura.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/focus/accelerator_handler.h"
+#include "ui/views/focus/accelerator_handler.h"
 
 namespace views {
 
diff --git a/ui/views/focus/accelerator_handler_gtk.cc b/ui/views/focus/accelerator_handler_gtk.cc
index fab3b86..2191686 100644
--- a/ui/views/focus/accelerator_handler_gtk.cc
+++ b/ui/views/focus/accelerator_handler_gtk.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/focus/accelerator_handler.h"
+#include "ui/views/focus/accelerator_handler.h"
 
 #include <gtk/gtk.h>
 
-#include "views/focus/focus_manager.h"
+#include "ui/views/focus/focus_manager.h"
 
 namespace views {
 
diff --git a/ui/views/focus/accelerator_handler_gtk_unittest.cc b/ui/views/focus/accelerator_handler_gtk_unittest.cc
index 098325d..f549b9c 100644
--- a/ui/views/focus/accelerator_handler_gtk_unittest.cc
+++ b/ui/views/focus/accelerator_handler_gtk_unittest.cc
@@ -5,10 +5,10 @@
 #include <gdk/gdkkeysyms.h>
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/rect.h"
 #include "ui/base/models/accelerator.h"
-#include "views/focus/accelerator_handler.h"
-#include "views/focus/focus_manager.h"
+#include "ui/gfx/rect.h"
+#include "ui/views/focus/accelerator_handler.h"
+#include "ui/views/focus/focus_manager.h"
 #include "views/view.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_delegate.h"
diff --git a/ui/views/focus/accelerator_handler_touch.cc b/ui/views/focus/accelerator_handler_touch.cc
index 1c4c9b3..5012dc2 100644
--- a/ui/views/focus/accelerator_handler_touch.cc
+++ b/ui/views/focus/accelerator_handler_touch.cc
@@ -2,16 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/focus/accelerator_handler.h"
+#include "ui/views/focus/accelerator_handler.h"
 
-#include <bitset>
-#include <gtk/gtk.h>
 #include <X11/extensions/XInput2.h>
+#include <gtk/gtk.h>
+
+#include <bitset>
 
 #include "ui/base/touch/touch_factory.h"
+#include "ui/views/events/event.h"
+#include "ui/views/focus/focus_manager.h"
 #include "ui/views/ime/input_method.h"
-#include "views/events/event.h"
-#include "views/focus/focus_manager.h"
 #include "views/view.h"
 #include "views/widget/native_widget.h"
 
diff --git a/ui/views/focus/accelerator_handler_wayland.cc b/ui/views/focus/accelerator_handler_wayland.cc
index a8963ee..167ae68 100644
--- a/ui/views/focus/accelerator_handler_wayland.cc
+++ b/ui/views/focus/accelerator_handler_wayland.cc
@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/focus/accelerator_handler.h"
+#include "ui/views/focus/accelerator_handler.h"
 
-#include "views/focus/focus_manager.h"
+#include "ui/views/focus/focus_manager.h"
 
 namespace views {
 
diff --git a/ui/views/focus/accelerator_handler_win.cc b/ui/views/focus/accelerator_handler_win.cc
index 8f2c8e8..f923cd0 100644
--- a/ui/views/focus/accelerator_handler_win.cc
+++ b/ui/views/focus/accelerator_handler_win.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/focus/accelerator_handler.h"
+#include "ui/views/focus/accelerator_handler.h"
 
-#include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
-#include "views/events/event.h"
-#include "views/focus/focus_manager.h"
+#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"
 
 namespace views {
diff --git a/ui/views/focus/external_focus_tracker.cc b/ui/views/focus/external_focus_tracker.cc
index 193b57e..7e58bc6 100644
--- a/ui/views/focus/external_focus_tracker.cc
+++ b/ui/views/focus/external_focus_tracker.cc
@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/focus/external_focus_tracker.h"
+#include "ui/views/focus/external_focus_tracker.h"
 
 #include "base/logging.h"
+#include "ui/views/focus/view_storage.h"
 #include "views/view.h"
-#include "views/focus/view_storage.h"
 
 namespace views {
 
diff --git a/ui/views/focus/external_focus_tracker.h b/ui/views/focus/external_focus_tracker.h
index 0ea1479..d8493c7 100644
--- a/ui/views/focus/external_focus_tracker.h
+++ b/ui/views/focus/external_focus_tracker.h
@@ -6,7 +6,7 @@
 #define UI_VIEWS_FOCUS_EXTERNAL_FOCUS_TRACKER_H_
 #pragma once
 
-#include "views/focus/focus_manager.h"
+#include "ui/views/focus/focus_manager.h"
 
 namespace views {
 
diff --git a/ui/views/focus/focus_manager.cc b/ui/views/focus/focus_manager.cc
index 3ee0755..268623b 100644
--- a/ui/views/focus/focus_manager.cc
+++ b/ui/views/focus/focus_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/focus/focus_manager.h"
+#include "ui/views/focus/focus_manager.h"
 
 #include <algorithm>
 
@@ -12,9 +12,9 @@
 #include "ui/base/accelerator_manager.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/models/accelerator.h"
-#include "views/focus/focus_search.h"
-#include "views/focus/view_storage.h"
-#include "views/focus/widget_focus_manager.h"
+#include "ui/views/focus/focus_search.h"
+#include "ui/views/focus/view_storage.h"
+#include "ui/views/focus/widget_focus_manager.h"
 #include "views/view.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
diff --git a/ui/views/focus/focus_manager.h b/ui/views/focus/focus_manager.h
index 0fdecc1..01899e1 100644
--- a/ui/views/focus/focus_manager.h
+++ b/ui/views/focus/focus_manager.h
@@ -14,8 +14,8 @@
 #include "base/observer_list.h"
 #include "ui/base/models/accelerator.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/views/events/event.h"
 #include "views/views_export.h"
-#include "views/events/event.h"
 
 // The FocusManager class is used to handle focus traversal, store/restore
 // focused views and handle keyboard accelerators.
diff --git a/ui/views/focus/focus_manager_factory.cc b/ui/views/focus/focus_manager_factory.cc
index 457f60b..e3ec805 100644
--- a/ui/views/focus/focus_manager_factory.cc
+++ b/ui/views/focus/focus_manager_factory.cc
@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/focus/focus_manager_factory.h"
+#include "ui/views/focus/focus_manager_factory.h"
 
 #include "base/compiler_specific.h"
-#include "views/focus/focus_manager.h"
+#include "ui/views/focus/focus_manager.h"
 
 namespace {
 
diff --git a/ui/views/focus/focus_manager_unittest.cc b/ui/views/focus/focus_manager_unittest.cc
index d4372f2..a0420e9 100644
--- a/ui/views/focus/focus_manager_unittest.cc
+++ b/ui/views/focus/focus_manager_unittest.cc
@@ -11,6 +11,8 @@
 #include "ui/base/models/accelerator.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/gfx/rect.h"
+#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/window/non_client_view.h"
 #include "views/background.h"
@@ -26,8 +28,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/focus/accelerator_handler.h"
-#include "views/focus/focus_manager_factory.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_delegate.h"
diff --git a/ui/views/focus/focus_search.cc b/ui/views/focus/focus_search.cc
index eac3f21..e1f3c7b 100644
--- a/ui/views/focus/focus_search.cc
+++ b/ui/views/focus/focus_search.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "base/logging.h"
-#include "views/focus/focus_manager.h"
-#include "views/focus/focus_search.h"
+#include "ui/views/focus/focus_manager.h"
+#include "ui/views/focus/focus_search.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/ui/views/focus/view_storage.cc b/ui/views/focus/view_storage.cc
index 3b9ec10..ae17c73 100644
--- a/ui/views/focus/view_storage.cc
+++ b/ui/views/focus/view_storage.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/focus/view_storage.h"
+#include "ui/views/focus/view_storage.h"
 
 #include <algorithm>
 
diff --git a/ui/views/focus/widget_focus_manager.cc b/ui/views/focus/widget_focus_manager.cc
index 57cd2cd..d2b67d7 100644
--- a/ui/views/focus/widget_focus_manager.cc
+++ b/ui/views/focus/widget_focus_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/focus/widget_focus_manager.h"
+#include "ui/views/focus/widget_focus_manager.h"
 
 #include "base/memory/singleton.h"
 
diff --git a/ui/views/ime/input_method_base.h b/ui/views/ime/input_method_base.h
index cdecbda..da2e459 100644
--- a/ui/views/ime/input_method_base.h
+++ b/ui/views/ime/input_method_base.h
@@ -8,9 +8,9 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/focus/focus_manager.h"
 #include "ui/views/ime/input_method.h"
 #include "ui/views/ime/input_method_delegate.h"
-#include "views/focus/focus_manager.h"
 
 namespace gfx {
 class Rect;
diff --git a/ui/views/ime/input_method_gtk.cc b/ui/views/ime/input_method_gtk.cc
index edaa20e..9de362b 100644
--- a/ui/views/ime/input_method_gtk.cc
+++ b/ui/views/ime/input_method_gtk.cc
@@ -19,7 +19,7 @@
 #include "ui/base/gtk/gtk_im_context_util.h"
 #include "ui/base/keycodes/keyboard_code_conversion_gtk.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "views/events/event.h"
+#include "ui/views/events/event.h"
 #include "views/widget/widget.h"
 
 namespace views {
diff --git a/ui/views/ime/input_method_ibus.cc b/ui/views/ime/input_method_ibus.cc
index 9fa9525..82b1455 100644
--- a/ui/views/ime/input_method_ibus.cc
+++ b/ui/views/ime/input_method_ibus.cc
@@ -25,7 +25,7 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
-#include "views/events/event.h"
+#include "ui/views/events/event.h"
 #include "views/widget/widget.h"
 
 #if defined(USE_AURA) || defined(TOUCH_UI)
diff --git a/ui/views/ime/input_method_ibus.h b/ui/views/ime/input_method_ibus.h
index 8d7b591..c4b516b 100644
--- a/ui/views/ime/input_method_ibus.h
+++ b/ui/views/ime/input_method_ibus.h
@@ -17,8 +17,8 @@
 #include "ui/base/ime/character_composer.h"
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/text_input_client.h"
+#include "ui/views/events/event.h"
 #include "ui/views/ime/input_method_base.h"
-#include "views/events/event.h"
 #include "views/view.h"
 
 // Forward declarations, so that we don't need to include ibus.h in this file.
diff --git a/ui/views/ime/input_method_win.cc b/ui/views/ime/input_method_win.cc
index 1bc56b1..5411e3f 100644
--- a/ui/views/ime/input_method_win.cc
+++ b/ui/views/ime/input_method_win.cc
@@ -10,7 +10,7 @@
 #include "ui/base/ime/composition_text.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "views/events/event.h"
+#include "ui/views/events/event.h"
 
 // Extra number of chars before and after selection (or composition) range which
 // is returned to IME for improving conversion accuracy.
diff --git a/ui/views/ime/mock_input_method.cc b/ui/views/ime/mock_input_method.cc
index 52a5912..8365f74 100644
--- a/ui/views/ime/mock_input_method.cc
+++ b/ui/views/ime/mock_input_method.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "views/events/event.h"
+#include "ui/views/events/event.h"
 #include "views/widget/widget.h"
 
 namespace views {
diff --git a/ui/views/layout/box_layout.cc b/ui/views/layout/box_layout.cc
index 5441e87..7471b4c 100644
--- a/ui/views/layout/box_layout.cc
+++ b/ui/views/layout/box_layout.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/layout/box_layout.h"
+#include "ui/views/layout/box_layout.h"
 
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
diff --git a/ui/views/layout/box_layout.h b/ui/views/layout/box_layout.h
index 81e5a94..7235119 100644
--- a/ui/views/layout/box_layout.h
+++ b/ui/views/layout/box_layout.h
@@ -8,7 +8,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "views/layout/layout_manager.h"
+#include "ui/views/layout/layout_manager.h"
 
 namespace gfx {
 class Size;
diff --git a/ui/views/layout/box_layout_unittest.cc b/ui/views/layout/box_layout_unittest.cc
index 12ea2b5..0430c0c 100644
--- a/ui/views/layout/box_layout_unittest.cc
+++ b/ui/views/layout/box_layout_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "views/layout/box_layout.h"
+#include "ui/views/layout/box_layout.h"
 #include "views/view.h"
 
 class StaticSizedView : public views::View {
diff --git a/ui/views/layout/fill_layout.cc b/ui/views/layout/fill_layout.cc
index 13fbcce..65c397b 100644
--- a/ui/views/layout/fill_layout.cc
+++ b/ui/views/layout/fill_layout.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/layout/fill_layout.h"
+#include "ui/views/layout/fill_layout.h"
 
 #include "base/logging.h"
 
diff --git a/ui/views/layout/fill_layout.h b/ui/views/layout/fill_layout.h
index 604d9b5..c57adf0 100644
--- a/ui/views/layout/fill_layout.h
+++ b/ui/views/layout/fill_layout.h
@@ -6,7 +6,7 @@
 #define UI_VIEWS_LAYOUT_FILL_LAYOUT_H_
 #pragma once
 
-#include "views/layout/layout_manager.h"
+#include "ui/views/layout/layout_manager.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/ui/views/layout/grid_layout.cc b/ui/views/layout/grid_layout.cc
index 55a50ceb..7444b8b 100644
--- a/ui/views/layout/grid_layout.cc
+++ b/ui/views/layout/grid_layout.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/layout/grid_layout.h"
+#include "ui/views/layout/grid_layout.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "ui/gfx/insets.h"
-#include "views/layout/layout_constants.h"
+#include "ui/views/layout/layout_constants.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/ui/views/layout/grid_layout.h b/ui/views/layout/grid_layout.h
index 6c38585..ea0aba7 100644
--- a/ui/views/layout/grid_layout.h
+++ b/ui/views/layout/grid_layout.h
@@ -9,7 +9,7 @@
 #include <string>
 #include <vector>
 
-#include "views/layout/layout_manager.h"
+#include "ui/views/layout/layout_manager.h"
 #include "views/view.h"
 
 namespace gfx {
diff --git a/ui/views/layout/grid_layout_unittest.cc b/ui/views/layout/grid_layout_unittest.cc
index 542d7c5..d7911c6 100644
--- a/ui/views/layout/grid_layout_unittest.cc
+++ b/ui/views/layout/grid_layout_unittest.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
-#include "views/layout/grid_layout.h"
+#include "ui/views/layout/grid_layout.h"
 #include "views/view.h"
 
 using views::ColumnSet;
diff --git a/ui/views/layout/layout_manager.cc b/ui/views/layout/layout_manager.cc
index c62c6bb..f2b4e8a 100644
--- a/ui/views/layout/layout_manager.cc
+++ b/ui/views/layout/layout_manager.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/layout/layout_manager.h"
+#include "ui/views/layout/layout_manager.h"
 
 #include "views/view.h"
 
diff --git a/ui/views/touchui/gesture_manager.cc b/ui/views/touchui/gesture_manager.cc
index e935a46..0508592 100644
--- a/ui/views/touchui/gesture_manager.cc
+++ b/ui/views/touchui/gesture_manager.cc
@@ -9,7 +9,7 @@
 #endif
 
 #include "base/logging.h"
-#include "views/events/event.h"
+#include "ui/views/events/event.h"
 #include "views/view.h"
 #include "views/views_delegate.h"
 #include "views/widget/widget.h"
diff --git a/ui/views/touchui/touch_selection_controller_impl.cc b/ui/views/touchui/touch_selection_controller_impl.cc
index 8fb532f..30f94cc 100644
--- a/ui/views/touchui/touch_selection_controller_impl.cc
+++ b/ui/views/touchui/touch_selection_controller_impl.cc
@@ -17,13 +17,13 @@
 #include "ui/gfx/screen.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/transform.h"
+#include "ui/views/layout/box_layout.h"
 #include "views/background.h"
 #include "views/controls/button/button.h"
 #include "views/controls/button/custom_button.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/controls/menu/menu_config.h"
-#include "views/layout/box_layout.h"
 #include "views/widget/widget.h"
 
 namespace {
diff --git a/ui/views/window/dialog_client_view.cc b/ui/views/window/dialog_client_view.cc
index 46c9d03..610ae8d 100644
--- a/ui/views/window/dialog_client_view.cc
+++ b/ui/views/window/dialog_client_view.cc
@@ -24,9 +24,9 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/font.h"
+#include "ui/views/layout/layout_constants.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "views/controls/button/text_button.h"
-#include "views/layout/layout_constants.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
diff --git a/ui/views/window/dialog_client_view.h b/ui/views/window/dialog_client_view.h
index 7ea9720..6602709 100644
--- a/ui/views/window/dialog_client_view.h
+++ b/ui/views/window/dialog_client_view.h
@@ -7,9 +7,9 @@
 #pragma once
 
 #include "ui/gfx/font.h"
+#include "ui/views/focus/focus_manager.h"
 #include "ui/views/window/client_view.h"
 #include "views/controls/button/button.h"
-#include "views/focus/focus_manager.h"
 
 namespace views {