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

chrome/browser/ui/views/html_dialog_view_browsertest.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 "base/file_path.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/views/html_dialog_view.h"
@@ skipping 59 matching lines @@
 #if defined(OS_WIN)
   class WindowChangedObserver : public MessageLoopForUI::Observer {
    public:
     WindowChangedObserver() {}
 
     static WindowChangedObserver* GetInstance() {
       return Singleton<WindowChangedObserver>::get();
     }
 
     // This method is called before processing a message.
-    virtual void WillProcessMessage(const MSG& msg) {}
+    virtual base::EventStatus WillProcessEvent(
+        const MSG& msg) OVERRIDE {
+      return base::EVENT_CONTINUE;
+    }
 
     // This method is called after processing a message.
-    virtual void DidProcessMessage(const MSG& msg) {
+    virtual void DidProcessEvent(const MSG& msg) 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
       // WM_WINDOWPOSCHANGED message here).
       if (msg.message == WM_PAINT || msg.message == WM_TIMER)
         MessageLoop::current()->Quit();
     }
   };
-#elif !defined(OS_MACOSX)
+#elif defined(TOUCH_UI) || defined(USE_AURA)
   class WindowChangedObserver : public MessageLoopForUI::Observer {
    public:
     WindowChangedObserver() {}
+
+    static WindowChangedObserver* GetInstance() {
+      return Singleton<WindowChangedObserver>::get();
+    }
+
+    // This method is called before processing a message.
+    virtual base::EventStatus WillProcessEvent(XEvent* event) {
+      return base::EVENT_CONTINUE;
+    }
+
+    // This method is called after processing a message.
+    virtual void DidProcessEvent(XEvent* event) {
+      // Quit once the ConfigureNotify event has been processed - seeing
+      // this means the window sizing request that was made actually
+      // happened.
+      if (event->type == ConfigureNotify)
+        MessageLoop::current()->Quit();
+    }
+  };
+#elif defined(TOOLKIT_USES_GTK)
+  class WindowChangedObserver : public MessageLoopForUI::Observer {
+   public:
+    WindowChangedObserver() {}
 
     static WindowChangedObserver* GetInstance() {
       return Singleton<WindowChangedObserver>::get();
     }
 
     // This method is called before processing a message.
     virtual void WillProcessEvent(GdkEvent* event) {}
 
     // This method is called after processing a message.
     virtual void DidProcessEvent(GdkEvent* event) {
@@ skipping 120 matching lines @@
       WindowChangedObserver::GetInstance());
   // We use busy loop because the state is updated in notifications.
   while (html_view->state_ != HtmlDialogView::PAINTED)
     MessageLoop::current()->RunAllPending();
 
   EXPECT_EQ(HtmlDialogView::PAINTED, html_view->state_);
 
   MessageLoopForUI::current()->RemoveObserver(
       WindowChangedObserver::GetInstance());
 }