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

chrome/browser/ui/panels/panel_browser_frame_view.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
 #define CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_
 #pragma once
 
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 89 matching lines @@
     PAINT_FOR_ATTENTION
   };
 
   class MouseWatcher : public MessageLoopForUI::Observer {
    public:
     explicit MouseWatcher(PanelBrowserFrameView* view);
     virtual ~MouseWatcher();
 
     virtual bool IsCursorInViewBounds() const;
 
-  #if defined(OS_WIN)
-    virtual void WillProcessMessage(const MSG& msg) OVERRIDE;
-    virtual void DidProcessMessage(const MSG& msg) OVERRIDE;
+  #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;
-  #elif defined(USE_AURA)
-    virtual EventStatus WillProcessXEvent(XEvent* xevent) OVERRIDE;
   #endif
 
    private:
     void HandleGlobalMouseMoveEvent();
 
     PanelBrowserFrameView* view_;
     bool is_mouse_within_;
 
     DISALLOW_COPY_AND_ASSIGN(MouseWatcher);
   };
@@ skipping 56 matching lines @@
   scoped_ptr<PanelSettingsMenuModel> settings_menu_model_;
   scoped_ptr<views::MenuModelAdapter> settings_menu_adapter_;
   views::MenuItemView* settings_menu_;  // Owned by |settings_menu_runner_|.
   scoped_ptr<views::MenuRunner> settings_menu_runner_;
   scoped_ptr<ExtensionUninstallDialog> extension_uninstall_dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(PanelBrowserFrameView);
 };
 
 #endif  // CHROME_BROWSER_UI_PANELS_PANEL_BROWSER_FRAME_VIEW_H_