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

chrome/browser/ui/views/html_dialog_view_browsertest.cc

Index: chrome/browser/ui/views/html_dialog_view_browsertest.cc
diff --git a/chrome/browser/ui/views/html_dialog_view_browsertest.cc b/chrome/browser/ui/views/html_dialog_view_browsertest.cc
index 8ef4c15bd5dec308f4caac4f38f41914b1d754e8..756b95d72face72dcfbd0f09b7ec3d8a72c43064 100644
--- a/chrome/browser/ui/views/html_dialog_view_browsertest.cc
+++ b/chrome/browser/ui/views/html_dialog_view_browsertest.cc
@@ -67,7 +67,6 @@ class HtmlDialogBrowserTest : public InProcessBrowserTest {
  public:
   HtmlDialogBrowserTest() {}
 
-#if defined(OS_WIN)
   class WindowChangedObserver : public MessageLoopForUI::Observer {
    public:
     WindowChangedObserver() {}
@@ -76,11 +75,15 @@ class HtmlDialogBrowserTest : public InProcessBrowserTest {
       return Singleton<WindowChangedObserver>::get();
     }
 
+#if defined(OS_WIN)
     // This method is called before processing a message.
-    virtual void WillProcessMessage(const MSG& msg) {}
+    virtual base::EventStatus WillProcessEvent(
+        const base::NativeEvent& event) OVERRIDE {
+      return base::EVENT_CONTINUE;
+    }
 
     // This method is called after processing a message.
-    virtual void DidProcessMessage(const MSG& msg) {
+    virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE {
       // Either WM_PAINT or WM_TIMER indicates the actual work of
       // pushing through the window resizing messages is done since
       // they are lower priority (we don't get to see the
@@ -88,16 +91,21 @@ class HtmlDialogBrowserTest : public InProcessBrowserTest {
       if (msg.message == WM_PAINT || msg.message == WM_TIMER)

[msw, 2011/09/27 03:51:42]

event.message

[oshima, 2011/09/27 16:39:39]

Done.

         MessageLoop::current()->Quit();
     }
-  };
-#elif !defined(OS_MACOSX)
-  class WindowChangedObserver : public MessageLoopForUI::Observer {
-   public:
-    WindowChangedObserver() {}
 
-    static WindowChangedObserver* GetInstance() {
-      return Singleton<WindowChangedObserver>::get();
+#elif defined(TOUCH_UI) || defined(USE_AURA)
+    // This method is called before processing a message.
+    virtual base::EventStatus WillProcessEvent(const base::NativeEvent& event) {
+      return base::EVENT_CONTINUE;
     }
 
+    // This method is called after processing a message.
+    virtual void DidProcessEvent(const base::NativeEvent& event) {
+      // TODO(oshima): X11/Xlib.h imports various definitions that
+      // caused compilation error.
+      NOTIMPLEMENTED();
+    }
+  };
+#elif defined(TOOLKIT_USES_GTK)
     // This method is called before processing a message.
     virtual void WillProcessEvent(GdkEvent* event) {}
 
@@ -109,8 +117,8 @@ class HtmlDialogBrowserTest : public InProcessBrowserTest {
       if (event->type == GDK_CONFIGURE)
         MessageLoop::current()->Quit();
     }
-  };
 #endif
+  };
 };
 
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
@@ -145,6 +153,7 @@ IN_PROC_BROWSER_TEST_F(HtmlDialogBrowserTest, MAYBE_SizeWindow) {
   gfx::Rect actual_bounds, rwhv_bounds;
 
   // Bigger than the default in both dimensions.
+

[sadrul, 2011/09/27 04:13:23]

-blank line

[oshima, 2011/09/27 16:39:39]

Done.

   set_bounds.set_width(400);
   set_bounds.set_height(300);