Consolidate/cleanup event cracking code; single out GdkEvents.

chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc

Index: chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc
diff --git a/chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc b/chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc
index 5b611bce1ace8be430988e8d2576438d2657ddca..6698a244e1b815980ccda79fbcdce2f9a8bde3fc 100644
--- a/chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc
+++ b/chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.cc
@@ -34,6 +34,10 @@
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
+#if defined(OS_WIN)
+#include "ui/base/win/event_util.h"
+#endif
+
 namespace {
 
 const int kHideTimeoutInSeconds = 2;
@@ -147,8 +151,7 @@ void MouseObserver::StopObserving(MessageLoopForUI* loop) {
 
 bool MouseObserver::IsMouseEvent(const views::NativeEvent& native_event) {
 #if defined(OS_WIN) || defined(USE_AURA)
-  return views::IsClientMouseEvent(native_event) ||
-         views::IsNonClientMouseEvent(native_event);
+  return ui::IsMouseEvent(native_event);
 #elif defined(OS_LINUX)
   return native_event->type == GDK_MOTION_NOTIFY ||
          native_event->type == GDK_BUTTON_PRESS ||