Remove remaining TOUCH_UI code under chromeos.

BUG=none
TEST=none


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

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

4 files changed, 1 insertions, 67 deletions

diff --git a/chrome/browser/chromeos/frame/panel_controller.cc b/chrome/browser/chromeos/frame/panel_controller.cc
index 7717974..08a2ef9 100644
--- a/chrome/browser/chromeos/frame/panel_controller.cc
+++ b/chrome/browser/chromeos/frame/panel_controller.cc
@@ -4,11 +4,6 @@
 
 #include "chrome/browser/chromeos/frame/panel_controller.h"
 
-#if defined(TOUCH_UI)
-#include <X11/Xlib.h>
-#include <X11/extensions/XInput2.h>
-#endif
-
 #include <vector>
 
 #include "base/logging.h"
@@ -40,39 +35,6 @@
 #include "chrome/browser/chromeos/legacy_window_manager/wm_ipc.h"
 #endif
 
-#if defined(TOUCH_UI)
-namespace {
-
-gfx::Point RootLocationFromXEvent(const XEvent* xev) {
-  switch (xev->type) {
-    case ButtonPress:
-    case ButtonRelease:
-      return gfx::Point(xev->xbutton.x_root, xev->xbutton.y_root);
-    case MotionNotify:
-      return gfx::Point(xev->xmotion.x_root, xev->xmotion.y_root);
-
-    case GenericEvent: {
-      const XIDeviceEvent* xiev =
-          static_cast<XIDeviceEvent*>(xev->xcookie.data);
-      switch (xiev->evtype) {
-        case XI_ButtonPress:
-        case XI_ButtonRelease:
-        case XI_Motion:
-          return gfx::Point(static_cast<int>(xiev->root_x),
-                            static_cast<int>(xiev->root_y));
-      }
-    }
-
-    default:
-      NOTREACHED();
-  }
-
-  return gfx::Point();
-}
-
-}  // namespace
-#endif  // defined(TOUCH_UI)
-
 namespace chromeos {
 
 static int close_button_width;
@@ -335,17 +297,10 @@ bool PanelController::TitleMouseDragged(const views::MouseEvent& event) {
     return false;
   }
 
-#if !defined(TOUCH_UI)
   const GdkEvent* gdk_event = event.gdk_event();
   GdkEventMotion last_motion_event = gdk_event->motion;
   int x_root = last_motion_event.x_root;
   int y_root = last_motion_event.y_root;
-#else
-  const XEvent* xev = event.native_event();
-  gfx::Point abs_location = RootLocationFromXEvent(xev);
-  int x_root = abs_location.x();
-  int y_root = abs_location.y();
-#endif
 
   if (!dragging_) {
     if (views::View::ExceededDragThreshold(x_root - mouse_down_abs_x_,
diff --git a/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.cc b/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.cc
index 42d9613..f9be739 100644
--- a/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.cc
+++ b/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.cc
@@ -16,16 +16,6 @@ WmMessageListener* WmMessageListener::GetInstance() {
   return instance;
 }
 
-#if defined(TOUCH_UI)
-// MessageLoopForUI::Observer overrides.
-base::EventStatus WmMessageListener::WillProcessEvent(
-    const base::NativeEvent& event) OVERRIDE {
-  return base::EVENT_CONTINUE;
-}
-
-void WmMessageListener::DidProcessEvent(const base::NativeEvent& event) {
-}
-#else
 void WmMessageListener::WillProcessEvent(GdkEvent* event) {
 }
 
@@ -45,7 +35,6 @@ void WmMessageListener::DidProcessEvent(GdkEvent* event) {
       WmIpc::instance()->HandleRootWindowPropertyEvent(*property_event);
   }
 }
-#endif
 
 WmMessageListener::WmMessageListener() {
 }
diff --git a/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h b/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h
index 41f505e..cdb2be4 100644
--- a/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h
+++ b/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h
@@ -38,16 +38,10 @@ class WmMessageListener : public MessageLoopForUI::Observer {
   void RemoveObserver(Observer* observer) {
     observers_.RemoveObserver(observer);
   }
-#if defined(TOUCH_UI)
-  // MessageLoopForUI::Observer overrides.
-  virtual base::EventStatus WillProcessEvent(
-      const base::NativeEvent& event) OVERRIDE;
-  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;
-#else
+
   // MessageLoopForUI::Observer overrides.
   virtual void WillProcessEvent(GdkEvent* event) OVERRIDE;
   virtual void DidProcessEvent(GdkEvent* event) OVERRIDE;
-#endif
 
  private:
   friend struct DefaultSingletonTraits<WmMessageListener>;
diff --git a/chrome/browser/chromeos/status/status_area_view.cc b/chrome/browser/chromeos/status/status_area_view.cc
index 9459cef..463ab79 100644
--- a/chrome/browser/chromeos/status/status_area_view.cc
+++ b/chrome/browser/chromeos/status/status_area_view.cc
@@ -18,11 +18,7 @@
 #endif
 
 // Number of pixels to separate each icon.
-#if defined(TOUCH_UI)
-const int kSeparation = 25;
-#else
 const int kSeparation = 0;
-#endif
 
 StatusAreaView::StatusAreaView()
     : need_return_focus_(false) {