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
 
 #include <algorithm>
 
 #include "base/i18n/rtl.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/compact_nav/compact_location_bar_view.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/tabs/base_tab_strip.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/common/notification_source.h"
 #include "ui/base/animation/slide_animation.h"
+#include "ui/base/events.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"
 
 namespace {
@@ skipping 26 matching lines @@
 #elif defined(OS_LINUX)
   virtual void WillProcessEvent(GdkEvent* native_event) OVERRIDE;
   virtual void DidProcessEvent(GdkEvent* native_event) OVERRIDE;
 #endif
 #endif
 
   void Observe(MessageLoopForUI* loop);
   void StopObserving(MessageLoopForUI* loop);
 
  private:
-  // TODO(mad): would be nice to have this on the views::Event class.
-  bool IsMouseEvent(const views::NativeEvent& native_event);
-
-  bool IsSameTopLevelWindow(views::NativeEvent native_event);
+  bool IsSameTopLevelWindow(ui::NativeEvent native_event);
 
   // Tests if the event occurred on the content area, using
   // root window's coordinates.
   bool HitContentArea(int x, int y);
 
   // Tests if |p| in the root window's coordinate is within the |view|'s bound.
   bool HitOnScreen(const views::View* view, const gfx::Point& p);
 
   CompactLocationBarViewHost* host_;
   BrowserView* browser_view_;
@@ skipping 21 matching lines @@
 #if !defined(USE_AURA)
 #if defined(OS_WIN)
 void MouseObserver::WillProcessMessage(const MSG& native_event) {}
 void MouseObserver::DidProcessMessage(const MSG& native_event) {
 #elif defined(OS_LINUX)
 void MouseObserver::WillProcessEvent(GdkEvent* native_event) {}
 void MouseObserver::DidProcessEvent(GdkEvent* native_event) {
 #endif
   // Hide the location bar iff the mouse is pressed on the
   // BrowserView's content area.
-  if (!IsMouseEvent(native_event))
+  if (!ui::IsMouseEvent(native_event))
     return;
   views::MouseEvent event(native_event);
   if (event.type() == ui::ET_MOUSE_PRESSED &&
       IsSameTopLevelWindow(native_event) &&
       HitContentArea(event.x(), event.y())) {
     host_->Hide(true);
   }
 }
 #endif
 
 void MouseObserver::Observe(MessageLoopForUI* loop) {
 #if !defined(USE_AURA)
   if (!observing_) {
     loop->AddObserver(this);
     observing_ = true;
   }
 #endif
 }
 
 void MouseObserver::StopObserving(MessageLoopForUI* loop) {
 #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);
-#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.
 // Then, with a GetTopLevel receiving a NativeWindow, we could do this in a
 // platform independent way.
-bool MouseObserver::IsSameTopLevelWindow(views::NativeEvent native_event) {
+bool MouseObserver::IsSameTopLevelWindow(ui::NativeEvent native_event) {
 #if defined(USE_AURA)
   // TODO(beng):
   NOTIMPLEMENTED();
   return false;
 #elif defined(OS_WIN)
   return platform_util::GetTopLevel(native_event.hwnd) == top_level_window_;
 #elif defined(OS_LINUX)
   return gdk_window_get_toplevel(
       reinterpret_cast<GdkEventAny*>(native_event)->window) ==
       top_level_window_->window;
@@ skipping 369 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;
 }