summaryrefslogtreecommitdiffstats
path: root/ui/views/focus
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-18 23:53:57 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-18 23:53:57 +0000
commit477ae05f2ed6229012f66ba8741ead7b26ee616c (patch)
treef9b1029443678a55f5df62c5a4f9e4efb23a00cb /ui/views/focus
parent86b3f4b2779d33edc06a7e72c768868316d34b6f (diff)
downloadchromium_src-477ae05f2ed6229012f66ba8741ead7b26ee616c.zip
chromium_src-477ae05f2ed6229012f66ba8741ead7b26ee616c.tar.gz
chromium_src-477ae05f2ed6229012f66ba8741ead7b26ee616c.tar.bz2
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
Diffstat (limited to 'ui/views/focus')
-rw-r--r--ui/views/focus/OWNERS1
-rw-r--r--ui/views/focus/accelerator_handler_aura.cc2
-rw-r--r--ui/views/focus/accelerator_handler_gtk.cc4
-rw-r--r--ui/views/focus/accelerator_handler_gtk_unittest.cc6
-rw-r--r--ui/views/focus/accelerator_handler_touch.cc11
-rw-r--r--ui/views/focus/accelerator_handler_wayland.cc4
-rw-r--r--ui/views/focus/accelerator_handler_win.cc8
-rw-r--r--ui/views/focus/external_focus_tracker.cc4
-rw-r--r--ui/views/focus/external_focus_tracker.h2
-rw-r--r--ui/views/focus/focus_manager.cc8
-rw-r--r--ui/views/focus/focus_manager.h2
-rw-r--r--ui/views/focus/focus_manager_factory.cc4
-rw-r--r--ui/views/focus/focus_manager_unittest.cc4
-rw-r--r--ui/views/focus/focus_search.cc4
-rw-r--r--ui/views/focus/view_storage.cc2
-rw-r--r--ui/views/focus/widget_focus_manager.cc2
16 files changed, 35 insertions, 33 deletions
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"