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 49 matching lines @@
   }
   virtual bool ShouldShowDialogTitle() const OVERRIDE { return true; }
 };
 
 }  // namespace
 
 class HtmlDialogBrowserTest : public InProcessBrowserTest {
  public:
   HtmlDialogBrowserTest() {}
 
 #if defined(OS_WIN)

[msw, 2011/09/27 01:16:46]

It looks like you could share the class decl, ctor, and GetInstance between all
these blocks, maybe some impl between win and touch/aura.

[oshima, 2011/09/27 02:12:12]

Done for class decl etc. I didn't share impl as it makes it harder to follow.

   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 {

[msw, 2011/09/27 01:16:46]

name/type (here and below), this should fit on a single line.

[oshima, 2011/09/27 02:12:12]

Done.

+      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(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)
+  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 32 matching lines @@
 
   MessageLoopForUI::current()->AddObserver(
       WindowChangedObserver::GetInstance());
 
   gfx::Rect bounds = html_view->GetWidget()->GetClientAreaScreenBounds();
 
   gfx::Rect set_bounds = bounds;
   gfx::Rect actual_bounds, rwhv_bounds;
 
   // Bigger than the default in both dimensions.
+
   set_bounds.set_width(400);
   set_bounds.set_height(300);
 
   html_view->MoveContents(tab_contents, set_bounds);
   ui_test_utils::RunMessageLoop();
   actual_bounds = html_view->GetWidget()->GetClientAreaScreenBounds();
   EXPECT_EQ(set_bounds, actual_bounds);
 
   rwhv_bounds =
       html_view->tab_contents()->GetRenderWidgetHostView()->GetViewBounds();
@@ skipping 68 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());
 }