Consolidate/cleanup event cracking code; single out GdkEvents.

ui/base/touchui/touch_factory.h

Index: ui/base/touchui/touch_factory.h
diff --git a/views/touchui/touch_factory.h b/ui/base/touchui/touch_factory.h
similarity index 97%
rename from views/touchui/touch_factory.h
rename to ui/base/touchui/touch_factory.h
index b18d8c38edede77969c88d8c703ddddf2381e6dd..a7a2832c4f13bf4af870ffba3a31ea36933043e1 100644
--- a/views/touchui/touch_factory.h
+++ b/ui/base/touchui/touch_factory.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_TOUCHUI_TOUCH_FACTORY_H_
-#define VIEWS_TOUCHUI_TOUCH_FACTORY_H_
+#ifndef UI_BASE_TOUCHUI_TOUCH_FACTORY_H_
+#define UI_BASE_TOUCHUI_TOUCH_FACTORY_H_
 #pragma once
 
 #include <bitset>
@@ -11,17 +11,17 @@
 
 #include "base/memory/singleton.h"
 #include "base/timer.h"
-#include "views/views_export.h"
+#include "ui/base/ui_export.h"
 
 typedef unsigned long Cursor;
 typedef unsigned long Window;
 typedef struct _XDisplay Display;
 typedef union _XEvent XEvent;
 
-namespace views {
+namespace ui {
 
 // Functions related to determining touch devices.
-class VIEWS_EXPORT TouchFactory {
+class UI_EXPORT TouchFactory {
  public:
   // Define the touch params following the Multi-touch Protocol.
   enum TouchParam {
@@ -191,6 +191,6 @@ class VIEWS_EXPORT TouchFactory {
   DISALLOW_COPY_AND_ASSIGN(TouchFactory);
 };
 
-}  // namespace views
+}  // namespace ui
 
-#endif  // VIEWS_TOUCHUI_TOUCH_FACTORY_H_
+#endif  // UI_BASE_TOUCHUI_TOUCH_FACTORY_H_