Consolidate/cleanup event cracking code; single out GdkEvents.

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

 // 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.
 
 #include "chrome/browser/ui/views/compact_nav/compact_location_bar_view_host.h"
 
 #if defined(TOOLKIT_USES_GTK)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 16 matching lines @@
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/rect.h"
 #include "views/controls/scrollbar/native_scroll_bar.h"
 #include "views/events/event.h"
 #include "views/focus/external_focus_tracker.h"
 #include "views/focus/view_storage.h"
 #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;
 // TODO(stevet): Share this with CompactLocationBarView. This is the actual
 // height, without the overlap added.
 const int kCompactNavbarSpacerHeight = 4;
 const int kBookmarkBarLocationBarOverlap = 2;
 const int kSpacerLocationbarOverlap = 1;
 
 }  // namespace
@@ skipping 93 matching lines @@
 #if !defined(USE_AURA)
   if (observing_) {
     loop->RemoveObserver(this);
     observing_ = false;
   }
 #endif
 }
 
 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 ||
          native_event->type == GDK_2BUTTON_PRESS ||
          native_event->type == GDK_3BUTTON_PRESS ||
          native_event->type == GDK_BUTTON_RELEASE;
 #endif
 }
 
 // TODO(mad): Would be nice to have a NativeEvent -> NativeWindow mapping.
@@ skipping 382 matching lines @@
 bool CompactLocationBarViewHost::IsCurrentTabIndex(int index) {
   return current_tab_model_index_ == index;
 }
 
 bool CompactLocationBarViewHost::IsCurrentTab(TabContents* contents) {
   TabStripModel* tab_strip_model = browser_view()->browser()->tabstrip_model();
   return tab_strip_model->ContainsIndex(current_tab_model_index_) &&
       tab_strip_model->GetTabContentsAt(current_tab_model_index_)->
           tab_contents() == contents;
 }