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

50 files changed, 55 insertions, 55 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
index f2ebcc1..0e9c8c2 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_browsertest.cc
@@ -31,7 +31,7 @@
 #include "chrome/test/ui_test_utils.h"
 #include "net/base/mock_host_resolver.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 #if defined(OS_LINUX)
 #include <gdk/gdk.h>
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 461e43d..9175049 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -99,7 +99,7 @@
 #include "net/proxy/proxy_config_service_fixed.h"
 #include "net/url_request/url_request_context.h"
 #include "chrome/browser/automation/ui_controls.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "webkit/glue/password_form.h"
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/automation/automation_provider.h b/chrome/browser/automation/automation_provider.h
index 3d4791d..a9dbc9d 100644
--- a/chrome/browser/automation/automation_provider.h
+++ b/chrome/browser/automation/automation_provider.h
@@ -34,7 +34,7 @@
 
 #if defined(OS_WIN)
 #include "ui/gfx/native_widget_types.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #endif  // defined(OS_WIN)
 
 class PopupMenuWaiter;
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index b896b3f..4d08873 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -80,7 +80,7 @@
 #include "net/url_request/url_request_context.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/base/message_box_flags.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 
 namespace {
diff --git a/chrome/browser/bookmarks/bookmark_drop_info.cc b/chrome/browser/bookmarks/bookmark_drop_info.cc
index 9a6106d..ba9d7a0 100644
--- a/chrome/browser/bookmarks/bookmark_drop_info.cc
+++ b/chrome/browser/bookmarks/bookmark_drop_info.cc
@@ -9,7 +9,7 @@
 #endif
 
 #include "base/basictypes.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/view_constants.h"
 
 BookmarkDropInfo::BookmarkDropInfo(gfx::NativeWindow wnd, int top_margin)
diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc
index 13c4b8d..6e26e9b 100644
--- a/chrome/browser/bookmarks/bookmark_utils.cc
+++ b/chrome/browser/bookmarks/bookmark_utils.cc
@@ -35,7 +35,7 @@
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/tree_node_iterator.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 #if defined(TOOLKIT_VIEWS)
 #include "ui/base/dragdrop/os_exchange_data.h"
diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc
index dfa9f1e..3ee210e 100644
--- a/chrome/browser/chromeos/frame/panel_controller.cc
+++ b/chrome/browser/chromeos/frame/panel_controller.cc
@@ -24,7 +24,7 @@
 #include "views/controls/button/image_button.h"
 #include "views/controls/image_view.h"
 #include "views/controls/label.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/painter.h"
 #include "views/view.h"
 #include "views/widget/widget_gtk.h"
diff --git a/chrome/browser/chromeos/input_method/candidate_window.cc b/chrome/browser/chromeos/input_method/candidate_window.cc
index fa3e003..bd5c0d2 100644
--- a/chrome/browser/chromeos/input_method/candidate_window.cc
+++ b/chrome/browser/chromeos/input_method/candidate_window.cc
@@ -19,7 +19,7 @@
 #include "ui/gfx/font.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/layout/fill_layout.h"
 #include "views/layout/grid_layout.h"
 #include "views/screen.h"
diff --git a/chrome/browser/chromeos/login/screen_locker_tester.cc b/chrome/browser/chromeos/login/screen_locker_tester.cc
index b9eb53e..75907f6 100644
--- a/chrome/browser/chromeos/login/screen_locker_tester.cc
+++ b/chrome/browser/chromeos/login/screen_locker_tester.cc
@@ -14,7 +14,7 @@
 #include "views/controls/button/button.h"
 #include "views/controls/label.h"
 #include "views/controls/textfield/textfield.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget_gtk.h"
 
diff --git a/chrome/browser/extensions/extension_input_api.cc b/chrome/browser/extensions/extension_input_api.cc
index 349e20e..bb91c00 100644
--- a/chrome/browser/extensions/extension_input_api.cc
+++ b/chrome/browser/extensions/extension_input_api.cc
@@ -16,7 +16,7 @@
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/native_web_keyboard_event.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/widget/root_view.h"
 
 namespace {
diff --git a/chrome/browser/extensions/key_identifier_conversion_views.cc b/chrome/browser/extensions/key_identifier_conversion_views.cc
index a4ded20..84dede3 100644
--- a/chrome/browser/extensions/key_identifier_conversion_views.cc
+++ b/chrome/browser/extensions/key_identifier_conversion_views.cc
@@ -10,7 +10,7 @@
 #include "base/hash_tables.h"
 #include "chrome/browser/browser_thread.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 namespace {
 
diff --git a/chrome/browser/extensions/key_identifier_conversion_views.h b/chrome/browser/extensions/key_identifier_conversion_views.h
index 29a1f16..51d6171 100644
--- a/chrome/browser/extensions/key_identifier_conversion_views.h
+++ b/chrome/browser/extensions/key_identifier_conversion_views.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 #include <string>
 
diff --git a/chrome/browser/history/redirect_uitest.cc b/chrome/browser/history/redirect_uitest.cc
index db19dfe..55d33bb 100644
--- a/chrome/browser/history/redirect_uitest.cc
+++ b/chrome/browser/history/redirect_uitest.cc
@@ -22,7 +22,7 @@
 #include "chrome/test/ui/ui_test.h"
 #include "net/base/net_util.h"
 #include "net/test/test_server.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 namespace {
 
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.cc b/chrome/browser/renderer_host/render_widget_host_view_views.cc
index fca20fb..0e1df3d 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.cc
@@ -25,7 +25,7 @@
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/x/x11_util.h"
 #include "ui/gfx/canvas.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/widget/widget.h"
 #include "views/widget/widget_gtk.h"
 
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views.h b/chrome/browser/renderer_host/render_widget_host_view_views.h
index fb1b33f..064a21e 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views.h
+++ b/chrome/browser/renderer_host/render_widget_host_view_views.h
@@ -16,7 +16,7 @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/gfx/native_widget_types.h"
 #include "views/controls/native/native_view_host.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/view.h"
 #include "webkit/glue/webcursor.h"
 
diff --git a/chrome/browser/ui/views/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmark_bubble_view.cc
index acafdc3..6a002e0 100644
--- a/chrome/browser/ui/views/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmark_bubble_view.cc
@@ -24,7 +24,7 @@
 #include "ui/gfx/color_utils.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/textfield/textfield.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/focus/focus_manager.h"
 #include "views/layout/grid_layout.h"
 #include "views/layout/layout_constants.h"
diff --git a/chrome/browser/ui/views/dom_view.h b/chrome/browser/ui/views/dom_view.h
index 7a95d30..17af6be 100644
--- a/chrome/browser/ui/views/dom_view.h
+++ b/chrome/browser/ui/views/dom_view.h
@@ -12,7 +12,7 @@
 #include "base/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
 #include "views/controls/native/native_view_host.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 class Profile;
 class SiteInstance;
diff --git a/chrome/browser/ui/views/download_item_view.h b/chrome/browser/ui/views/download_item_view.h
index 6e4c700..2bdfafd 100644
--- a/chrome/browser/ui/views/download_item_view.h
+++ b/chrome/browser/ui/views/download_item_view.h
@@ -29,7 +29,7 @@
 #include "chrome/browser/icon_manager.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/gfx/font.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/controls/button/button.h"
 #include "views/view.h"
 
diff --git a/chrome/browser/ui/views/event_utils.cc b/chrome/browser/ui/views/event_utils.cc
index 33704bb..2677f19 100644
--- a/chrome/browser/ui/views/event_utils.cc
+++ b/chrome/browser/ui/views/event_utils.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/browser/ui/views/event_utils.h"
 
-#include "views/event.h"
+#include "views/events/event.h"
 
 using views::Event;
 
diff --git a/chrome/browser/ui/views/first_run_bubble.cc b/chrome/browser/ui/views/first_run_bubble.cc
index 8d0277d..df041d3 100644
--- a/chrome/browser/ui/views/first_run_bubble.cc
+++ b/chrome/browser/ui/views/first_run_bubble.cc
@@ -21,7 +21,7 @@
 #include "views/controls/button/native_button.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/label.h"
-#include "views/event.h"
+#include "views/events/event.h"
 #include "views/focus/focus_manager.h"
 #include "views/layout/layout_constants.h"
 #include "views/widget/widget_win.h"
diff --git a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc
index 4a8f158..0ee3832 100644
--- a/chrome/browser/ui/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/ui/views/tabs/dragged_tab_controller.cc
@@ -33,7 +33,7 @@
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.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/chrome/browser/ui/views/tabs/tab_dragging_test.cc b/chrome/browser/ui/views/tabs/tab_dragging_test.cc
index ec5affe..5830deb 100644
--- a/chrome/browser/ui/views/tabs/tab_dragging_test.cc
+++ b/chrome/browser/ui/views/tabs/tab_dragging_test.cc
@@ -14,7 +14,7 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "ui/gfx/rect.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 #if defined(OS_LINUX)
 // This test doesn't make sense on chromeos as chromeos doesn't allow dragging
diff --git a/chrome/browser/unload_uitest.cc b/chrome/browser/unload_uitest.cc
index 4a940b0..ed32d6c 100644
--- a/chrome/browser/unload_uitest.cc
+++ b/chrome/browser/unload_uitest.cc
@@ -13,7 +13,7 @@
 #include "chrome/test/ui/ui_test.h"
 #include "net/url_request/url_request_test_util.h"
 #include "ui/base/message_box_flags.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 const std::string NOLISTENERS_HTML =
     "<html><head><title>nolisteners</title></head><body></body></html>";
diff --git a/chrome/test/automated_ui_tests/automated_ui_test_base.cc b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
index e662b10..f5cad88 100644
--- a/chrome/test/automated_ui_tests/automated_ui_test_base.cc
+++ b/chrome/test/automated_ui_tests/automated_ui_test_base.cc
@@ -12,7 +12,7 @@
 #include "chrome/test/ui/ui_test.h"
 #include "ui/gfx/point.h"
 #include "ui/gfx/rect.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 AutomatedUITestBase::AutomatedUITestBase() {}
 
diff --git a/chrome/test/automation/automation_proxy_uitest.cc b/chrome/test/automation/automation_proxy_uitest.cc
index 5680c77..9286459 100644
--- a/chrome/test/automation/automation_proxy_uitest.cc
+++ b/chrome/test/automation/automation_proxy_uitest.cc
@@ -43,7 +43,7 @@
 #include "ui/base/ui_base_switches.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/rect.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 using ui_test_utils::TimedMessageLoopRunner;
 using testing::CreateFunctor;
diff --git a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc
index a4cca5e..c14cbd3 100644
--- a/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc
+++ b/chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc
@@ -13,7 +13,7 @@
 #include "chrome/test/ui_test_utils.h"
 #include "ui/base/message_box_flags.h"
 #include "ui/gfx/rect.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 class FastShutdown : public UITest {
 };
diff --git a/chrome/test/interactive_ui/keyboard_access_uitest.cc b/chrome/test/interactive_ui/keyboard_access_uitest.cc
index 7e7b156..8bf28d0 100644
--- a/chrome/test/interactive_ui/keyboard_access_uitest.cc
+++ b/chrome/test/interactive_ui/keyboard_access_uitest.cc
@@ -9,7 +9,7 @@
 #include "chrome/test/ui/ui_test.h"
 #include "googleurl/src/gurl.h"
 #include "ui/base/keycodes/keyboard_codes.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 // This functionality currently works on Windows and on Linux when
 // toolkit_views is defined (i.e. for Chrome OS). It's not needed
diff --git a/chrome/test/ui/history_uitest.cc b/chrome/test/ui/history_uitest.cc
index 9a9a9e9..d7d29f0 100644
--- a/chrome/test/ui/history_uitest.cc
+++ b/chrome/test/ui/history_uitest.cc
@@ -13,7 +13,7 @@
 #include "chrome/test/ui/ui_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "ui/gfx/rect.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 namespace {
 
diff --git a/chrome/test/webdriver/commands/webdriver_command.cc b/chrome/test/webdriver/commands/webdriver_command.cc
index f1931c0..d1d0a73 100644
--- a/chrome/test/webdriver/commands/webdriver_command.cc
+++ b/chrome/test/webdriver/commands/webdriver_command.cc
@@ -19,7 +19,7 @@
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/webdriver/utility_functions.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 namespace webdriver {
 
diff --git a/chrome/test/webdriver/keymap.cc b/chrome/test/webdriver/keymap.cc
index bb08457..e1c3fec 100644
--- a/chrome/test/webdriver/keymap.cc
+++ b/chrome/test/webdriver/keymap.cc
@@ -5,7 +5,7 @@
 #include "chrome/test/webdriver/keymap.h"
 
 #include "chrome/browser/automation/ui_controls.h"
-#include "views/event.h"
+#include "views/events/event.h"
 
 namespace webdriver {
 
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"