Move Event files into views/events

BUG=none
TEST=none
TBR=sky

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

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

20 files changed, 25 insertions, 25 deletions

diff --git a/views/accelerator.h b/views/accelerator.h
index 5b37198..b399efc 100644
--- a/views/accelerator.h
+++ b/views/accelerator.h
@@ -16,7 +16,7 @@
 
 #include "base/string16.h"
 #include "ui/base/models/accelerator.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 namespace views {
 
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 5d08fa0..0cd933e 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -13,7 +13,7 @@
 #include "ui/gfx/canvas.h"
 #include "views/controls/button/button.h"
 #include "views/controls/menu/view_menu_delegate.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc
index 99513ca..14bbad0 100644
--- a/views/controls/button/text_button.cc
+++ b/views/controls/button/text_button.cc
@@ -12,7 +12,7 @@
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "views/controls/button/button.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "grit/app_resources.h"
 
 namespace views {
diff --git a/views/controls/link.cc b/views/controls/link.cc
index 2c4dbab..ab48bc2 100644
--- a/views/controls/link.cc
+++ b/views/controls/link.cc
@@ -12,7 +12,7 @@
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/font.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 #if defined(OS_LINUX)
 #include "ui/gfx/gtk_util.h"
diff --git a/views/controls/menu/menu_delegate.h b/views/controls/menu/menu_delegate.h
index d4f426f..e905876 100644
--- a/views/controls/menu/menu_delegate.h
+++ b/views/controls/menu/menu_delegate.h
@@ -14,7 +14,7 @@
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "views/controls/menu/controller.h"
 #include "views/controls/menu/menu_item_view.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 using ui::OSExchangeData;
 
diff --git a/views/controls/scrollbar/scroll_bar.h b/views/controls/scrollbar/scroll_bar.h
index 3a26b04..faed881 100644
--- a/views/controls/scrollbar/scroll_bar.h
+++ b/views/controls/scrollbar/scroll_bar.h
@@ -6,7 +6,7 @@
 #define VIEWS_CONTROLS_SCROLLBAR_SCROLLBAR_H_
 #pragma once
 
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/views/controls/textfield/native_textfield_views.cc b/views/controls/textfield/native_textfield_views.cc
index b02545f..11649ebf 100644
--- a/views/controls/textfield/native_textfield_views.cc
+++ b/views/controls/textfield/native_textfield_views.cc
@@ -20,7 +20,7 @@
 #include "views/controls/menu/menu_2.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/textfield/textfield_views_model.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/views_delegate.h"
 
 #if defined(OS_LINUX)
diff --git a/views/controls/textfield/native_textfield_views_unittest.cc b/views/controls/textfield/native_textfield_views_unittest.cc
index 3824868..b593d1d 100644
--- a/views/controls/textfield/native_textfield_views_unittest.cc
+++ b/views/controls/textfield/native_textfield_views_unittest.cc
@@ -13,7 +13,7 @@
 #include "views/controls/textfield/native_textfield_views.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/controls/textfield/textfield_views_model.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/focus/focus_manager.h"
 #include "views/test/test_views_delegate.h"
 #include "views/test/views_test_base.h"
diff --git a/views/event.cc b/views/events/event.cc
index cead011..e5e0a5a 100644
--- a/views/event.cc
+++ b/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/event.h"
+#include "views/events/event.h"
 
 #include "views/view.h"
 
diff --git a/views/event.h b/views/events/event.h
index b16371e..b16371e 100644
--- a/views/event.h
+++ b/views/events/event.h
diff --git a/views/event_gtk.cc b/views/events/event_gtk.cc
index 5b3cf21..e06ee32 100644
--- a/views/event_gtk.cc
+++ b/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/event.h"
+#include "views/events/event.h"
 
 #include <gdk/gdk.h>
 
diff --git a/views/event_win.cc b/views/events/event_win.cc
index 00d7c9b..fd33f9f 100644
--- a/views/event_win.cc
+++ b/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/event.h"
+#include "views/events/event.h"
 
 #include <windows.h>
 
diff --git a/views/event_x.cc b/views/events/event_x.cc
index dddcd2f..9c51c72 100644
--- a/views/event_x.cc
+++ b/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/event.h"
+#include "views/events/event.h"
 
 #include <gdk/gdkx.h>
 #if defined(HAVE_XINPUT2)
diff --git a/views/focus/accelerator_handler_touch.cc b/views/focus/accelerator_handler_touch.cc
index 9847beb..6dcd040 100644
--- a/views/focus/accelerator_handler_touch.cc
+++ b/views/focus/accelerator_handler_touch.cc
@@ -13,7 +13,7 @@
 #endif
 
 #include "views/accelerator.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/focus/focus_manager.h"
 #include "views/touchui/touch_factory.h"
 #include "views/widget/root_view.h"
diff --git a/views/focus/accelerator_handler_win.cc b/views/focus/accelerator_handler_win.cc
index c741155..ce6cecd 100644
--- a/views/focus/accelerator_handler_win.cc
+++ b/views/focus/accelerator_handler_win.cc
@@ -6,7 +6,7 @@
 
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/base/keycodes/keyboard_code_conversion_win.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/focus/focus_manager.h"
 
 namespace views {
diff --git a/views/touchui/gesture_manager.cc b/views/touchui/gesture_manager.cc
index 424470c..46ee0da 100644
--- a/views/touchui/gesture_manager.cc
+++ b/views/touchui/gesture_manager.cc
@@ -8,7 +8,7 @@
 #endif
 
 #include "base/logging.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/view.h"
 
 namespace views {
diff --git a/views/view_unittest.cc b/views/view_unittest.cc
index 2d81524..d2dc693 100644
--- a/views/view_unittest.cc
+++ b/views/view_unittest.cc
@@ -15,7 +15,7 @@
 #include "views/controls/native/native_view_host.h"
 #include "views/controls/scroll_view.h"
 #include "views/controls/textfield/textfield.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/focus/view_storage.h"
 #include "views/test/views_test_base.h"
diff --git a/views/views.gyp b/views/views.gyp
index 4b33286..36aa1e7 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -48,7 +48,7 @@
         ['include', '/win_[^/]*\\.cc$'],
       ]}],
       ['touchui==0', {'sources/': [
-        ['exclude', 'event_x.cc$'],
+        ['exclude', 'events/event_x.cc$'],
         ['exclude', 'native_menu_x.cc$'],
         ['exclude', 'native_menu_x.h$'],
         ['exclude', 'touchui/'],
@@ -257,11 +257,11 @@
         'drag_utils.h',
         'drag_utils_gtk.cc',
         'drag_utils_win.cc',
-        'event.cc',
-        'event.h',
-        'event_gtk.cc',
-        'event_win.cc',
-        'event_x.cc',
+        'events/event.cc',
+        'events/event.h',
+        'events/event_gtk.cc',
+        'events/event_win.cc',
+        'events/event_x.cc',
         'focus/accelerator_handler.h',
         'focus/accelerator_handler_gtk.cc',
         'focus/accelerator_handler_touch.cc',
@@ -397,7 +397,7 @@
             'controls/table/table_view.cc',
             'controls/table/group_table_view.cc',
             'controls/tree/tree_view.cc',
-            'event_win.cc',
+            'events/event_win.cc',
             'resize_corner.cc',
             'widget/child_window_message_processor.cc',
             'widget/child_window_message_processor.h',
diff --git a/views/widget/gtk_views_window.cc b/views/widget/gtk_views_window.cc
index 2eff8f1..b94c2cd 100644
--- a/views/widget/gtk_views_window.cc
+++ b/views/widget/gtk_views_window.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include <gtk/gtk.h>
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/widget/gtk_views_window.h"
 #include "views/focus/focus_manager.h"
 
diff --git a/views/window/window_gtk.cc b/views/window/window_gtk.cc
index 09614f5..13a9764 100644
--- a/views/window/window_gtk.cc
+++ b/views/window/window_gtk.cc
@@ -9,7 +9,7 @@
 #include "ui/gfx/gtk_util.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/rect.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/screen.h"
 #include "views/widget/root_view.h"
 #include "views/window/custom_frame_view.h"