Make HWNDMessageHandler subclass WindowImpl.

ui/views/win/hwnd_message_handler.h

 // Copyright (c) 2012 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 UI_VIEWS_WIN_HWND_MESSAGE_HANDLER_H_
 #define UI_VIEWS_WIN_HWND_MESSAGE_HANDLER_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlmisc.h>
 #include <windows.h>
 
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/message_loop.h"
 #include "base/string16.h"
 #include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/ui_base_types.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/ime/input_method_delegate.h"
 #include "ui/views/views_export.h"
 
 namespace gfx {
 class Canvas;
 class ImageSkia;
 class Insets;
 }
 
 namespace views {
 
 class FullscreenHandler;
 class HWNDMessageHandlerDelegate;
 class InputMethod;
 
 VIEWS_EXPORT bool IsAeroGlassEnabled();
 
 // An object that handles messages for a HWND that implements the views
 // "Custom Frame" look. The purpose of this class is to isolate the windows-
 // specific message handling from the code that wraps it. It is intended to be
 // used by both a views::NativeWidget and an aura::RootWindowHost
 // implementation.
 // TODO(beng): This object should eventually *become* the WindowImpl.
-class VIEWS_EXPORT HWNDMessageHandler : public internal::InputMethodDelegate {
+class VIEWS_EXPORT HWNDMessageHandler : public internal::InputMethodDelegate,
+                                        public MessageLoopForUI::Observer {
  public:
   explicit HWNDMessageHandler(HWNDMessageHandlerDelegate* delegate);
   ~HWNDMessageHandler();
 
   void Init(const gfx::Rect& bounds);
   void InitModalType(ui::ModalType modal_type);
 
   void Close();
   void CloseNow();
 
@@ skipping 71 matching lines @@
   void set_can_update_layered_window(bool can_update_layered_window) {
     can_update_layered_window_ = can_update_layered_window;
   }
   void SchedulePaintInRect(const gfx::Rect& rect);
   void SetOpacity(BYTE opacity);
 
   void SetWindowIcons(const gfx::ImageSkia& window_icon,
                       const gfx::ImageSkia& app_icon);
 
   // Message Handlers.
+  // This list is in _ALPHABETICAL_ order!
   void OnActivate(UINT action, BOOL minimized, HWND window);
   // TODO(beng): Once this object becomes the WindowImpl, these methods can
   //             be made private.
   void OnActivateApp(BOOL active, DWORD thread_id);
   // TODO(beng): return BOOL is temporary until this object becomes a
   //             WindowImpl.
   BOOL OnAppCommand(HWND window, short command, WORD device, int keystate);
   void OnCancelMode();
   void OnCaptureChanged(HWND window);
   void OnClose();
@@ skipping 65 matching lines @@
   // TODO(beng): remove once this is the WindowImpl.
   friend class NativeWidgetWin;
 
   // Overridden from internal::InputMethodDelegate:
   virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) OVERRIDE;
 
   // Overridden from WindowImpl:
   virtual HICON GetDefaultWindowIcon() const;
   virtual LRESULT OnWndProc(UINT message, WPARAM w_param, LPARAM l_param);
 
+  // Overridden from MessageLoopForUI::Observer:
+  virtual base::EventStatus WillProcessEvent(
+      const base::NativeEvent& event) OVERRIDE;
+  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;
+
   // Can be called after the delegate has had the opportunity to set focus and
   // did not do so.
   void SetInitialFocus();
 
   // Called after the WM_ACTIVATE message has been processed by the default
   // windows procedure.
   void PostProcessActivateMessage(int activation_state);
 
   // Enables disabled owner windows that may have been disabled due to this
   // window's modality.
@@ skipping 142 matching lines @@
   // True if we are allowed to update the layered window from the DIB backing
   // store if necessary.
   bool can_update_layered_window_;
 
   DISALLOW_COPY_AND_ASSIGN(HWNDMessageHandler);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIN_HWND_MESSAGE_HANDLER_H_