ui: Remove some unnecessary functions from the API.

ui/events/x/events_x.cc

 // Copyright (c) 2012 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.
 
 #include "ui/events/event_constants.h"
 
 #include <cmath>
 #include <string.h>
 #include <X11/extensions/XInput.h>
 #include <X11/extensions/XInput2.h>
@@ skipping 353 matching lines @@
         }
         case XI_ButtonRelease: {
           int button = EventButtonFromNative(native_event);
           // Drop wheel events; we should've already scrolled on the press.
           if (button >= kMinWheelButton && button <= kMaxWheelButton)
             return ET_UNKNOWN;
           return ET_MOUSE_RELEASED;
         }
         case XI_Motion: {
           bool is_cancel;
-          if (GetFlingData(native_event, NULL, NULL, NULL, NULL, &is_cancel)) {
+          DeviceDataManagerX11* devices = DeviceDataManagerX11::GetInstance();
+          if (GetFlingData(native_event, NULL, NULL, NULL, NULL, &is_cancel))
             return is_cancel ? ET_SCROLL_FLING_CANCEL : ET_SCROLL_FLING_START;
-          } else if (DeviceDataManagerX11::GetInstance()->IsScrollEvent(
-              native_event)) {
-            return IsTouchpadEvent(native_event) ? ET_SCROLL : ET_MOUSEWHEEL;
-          } else if (DeviceDataManagerX11::GetInstance()->IsCMTMetricsEvent(
-              native_event)) {
+          if (devices->IsScrollEvent(native_event)) {
+            return devices->IsTouchpadXInputEvent(native_event) ? ET_SCROLL
+                                                                : ET_MOUSEWHEEL;
+          }
+          if (devices->IsCMTMetricsEvent(native_event))
             return ET_UMA_DATA;
-          } else if (GetButtonMaskForX2Event(xievent)) {
+          if (GetButtonMaskForX2Event(xievent))
             return ET_MOUSE_DRAGGED;
-          }
           return ET_MOUSE_MOVED;
         }
         case XI_KeyPress:
           return ET_KEY_PRESSED;
         case XI_KeyRelease:
           return ET_KEY_RELEASED;
       }
     }
     default:
       break;
@@ skipping 406 matching lines @@
   if (!start_time)
     start_time = &start_time_;
   if (!end_time)
     end_time = &end_time_;
 
   DeviceDataManagerX11::GetInstance()->GetGestureTimes(
       native_event, start_time, end_time);
   return true;
 }
 
-bool IsTouchpadEvent(const base::NativeEvent& event) {
-  return DeviceDataManagerX11::GetInstance()->IsTouchpadXInputEvent(event);
-}
-
 }  // namespace ui