Consolidate message observer API for win and aura (and touch).

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 29 matching lines @@
 // 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
 
 // An mouse event observer to detect a mouse click on
 // BrowserView's content area and hide the location bar.
-class MouseObserver
-#if !defined(USE_AURA)
-    : public MessageLoopForUI::Observer
-#endif
-    {
+class MouseObserver : public MessageLoopForUI::Observer {
  public:
   MouseObserver(CompactLocationBarViewHost* host, BrowserView* view);
   ~MouseObserver();
 
   // MessageLoopForUI::Observer overrides.
-#if !defined(USE_AURA)
-#if defined(OS_WIN)
-  virtual void WillProcessMessage(const MSG& native_event) OVERRIDE;
-  virtual void DidProcessMessage(const MSG& native_event) OVERRIDE;
-#elif defined(OS_LINUX)
-  virtual void WillProcessEvent(GdkEvent* native_event) OVERRIDE;
-  virtual void DidProcessEvent(GdkEvent* native_event) OVERRIDE;
-#endif
+#if defined(OS_WIN) || defined(TOUCH_UI) || defined(USE_AURA)
+  virtual base::EventStatus WillProcessEvent(const base::NativeEvent& event) OVERRIDE;
+  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;
+#elif defined(TOOLKIT_USES_GTK)
+  virtual void WillProcessEvent(GdkEvent* event) OVERRIDE;
+  virtual void DidProcessEvent(GdkEvent* event) OVERRIDE;
 #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);
@@ skipping 21 matching lines @@
   DCHECK(host_);
   DCHECK(browser_view_);
   DCHECK(browser_view_->GetWidget());
   top_level_window_ = browser_view_->GetWidget()->GetNativeView();
 }
 
 MouseObserver::~MouseObserver() {
   StopObserving(MessageLoopForUI::current());
 }
 
-#if !defined(USE_AURA)
+#if defined(OS_WIN) || defined(TOUCH_UI) || defined(USE_AURA)
+base::EventStatus MouseObserver::WillProcessEvent(const base::NativeEvent& native_event) {
+  return base::EVENT_CONTINUE;
+}
+#elif defined(TOOLKIT_USES_GTK)
+void MouseObserver::WillProcessEvent(GdkEvent* native_event) {}
+#endif
+
+#if defined(TOUCH_UI) || defined(USE_AURA)
+void MouseObserver::DidProcessEvent(const base::NativeEvent& native_event) {
+  NOTIMPLEMENTED();
+}
+
+#else
+
 #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(const base::NativeEvent& native_event) {
+#elif defined(TOOLKIT_USES_GTK)
 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))
     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
+
+#endif // defined(TOUCH_UI) || defiend(USE_AURA)
 
 void MouseObserver::Observe(MessageLoopForUI* loop) {
 #if !defined(USE_AURA)
   if (!observing_) {
     loop->AddObserver(this);
     observing_ = true;
   }
 #endif
 }
 
@@ skipping 405 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;
 }