Consolidate/cleanup event cracking code; single out GdkEvents.

ui/base/touch/touch_factory.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // 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_TOUCH_TOUCH_FACTORY_H_
+#define UI_BASE_TOUCH_TOUCH_FACTORY_H_
 #pragma once
 
 #include <bitset>
 #include <vector>
 
 #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 {
     TP_TOUCH_MAJOR = 0,   // Length of the touch area.
     TP_TOUCH_MINOR,       // Width of the touch area.
     TP_ORIENTATION,       // Angle between the X-axis and the major axis of the
                           // touch area.
     TP_PRESSURE,          // Pressure of the touch contact.
 
     // NOTE: A touch event can have multiple touch points. So when we receive a
@@ skipping 159 matching lines @@
   // Maximum simultaneous touch points.
   static const int kMaxTouchPoints = 32;
 
   // A lookup table for slots in use for a touch event.
   std::bitset<kMaxTouchPoints> slots_used_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(TouchFactory);
 };
 
-}  // namespace views
+}  // namespace ui
 
-#endif  // VIEWS_TOUCHUI_TOUCH_FACTORY_H_
+#endif  // UI_BASE_TOUCH_TOUCH_FACTORY_H_