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 54 matching lines @@
   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.
+#if !defined(USE_AURA)
+#if defined(OS_WIN)
   bool IsMouseEvent(const views::NativeEvent& native_event);
+#elif defined(OS_LINUX)

[Ben Goodger (Google), 2011/09/24 16:39:04]

This should be TOOLKIT_USES_GTK, no?

[msw, 2011/09/26 05:08:00]

Done.

+  bool IsMouseEvent(GdkEvent* gdk_event);

[sadrul, 2011/09/24 16:56:08]

Are IsMouseEvent/IsSameTopLevelWindow not used/necessary when USE_AURA?

[msw, 2011/09/26 05:08:00]

The only caller, MouseObserver::DidProcessEvent, is not built for USE_AURA. This
builds but compact nav is deprecated, I'll fix it up later if needed.

+#endif
+#endif
 
+#if !defined(USE_AURA)
+#if defined(OS_WIN)
   bool IsSameTopLevelWindow(views::NativeEvent native_event);
+#elif defined(OS_LINUX)
+  bool IsSameTopLevelWindow(GdkEvent* gdk_event);
+#endif
+#endif
 
   // 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 50 matching lines @@
 
 void MouseObserver::StopObserving(MessageLoopForUI* loop) {
 #if !defined(USE_AURA)
   if (observing_) {
     loop->RemoveObserver(this);
     observing_ = false;
   }
 #endif
 }
 
+#if !defined(USE_AURA)
+#if defined(OS_WIN)
 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;
+bool MouseObserver::IsMouseEvent(GdkEvent* gdk_event) {
+  return gdk_event->type == GDK_MOTION_NOTIFY ||
+         gdk_event->type == GDK_BUTTON_PRESS ||
+         gdk_event->type == GDK_2BUTTON_PRESS ||
+         gdk_event->type == GDK_3BUTTON_PRESS ||
+         gdk_event->type == GDK_BUTTON_RELEASE;
+}
 #endif
-}
+#endif
 
+#if !defined(USE_AURA)
 // 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.
+#if defined(OS_WIN)
 bool MouseObserver::IsSameTopLevelWindow(views::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)
+bool MouseObserver::IsSameTopLevelWindow(GdkEvent* gdk_event) {
   return gdk_window_get_toplevel(
-      reinterpret_cast<GdkEventAny*>(native_event)->window) ==
+      reinterpret_cast<GdkEventAny*>(gdk_event)->window) ==
       top_level_window_->window;
+}
 #endif
-}
+#endif
 
 bool MouseObserver::HitContentArea(int x, int y) {
   gfx::Point p(x, y);
   // First, exclude the location bar as it's shown on top of
   // content area.
   if (HitOnScreen(host_->view(), p)) {
     return false;
   }
   // Treat the bookmark as a content area when it in detached mode. We must
   // check the view itself as it can be NULL for example in popup windows.
@@ skipping 357 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;
 }