Make HWNDMessageHandler subclass WindowImpl.

ui/views/win/hwnd_message_handler_delegate.h

Index: ui/views/win/hwnd_message_handler_delegate.h
===================================================================
--- ui/views/win/hwnd_message_handler_delegate.h	(revision 153552)
+++ ui/views/win/hwnd_message_handler_delegate.h	(working copy)
@@ -17,7 +17,6 @@
 namespace views {
 
 class InputMethod;
-class NativeWidgetWin;
 
 // Implemented by the object that uses the HWNDMessageHandler to handle
 // notifications from the underlying HWND and service requests for data.
@@ -37,6 +36,8 @@
   virtual bool CanMaximize() const = 0;
   virtual bool CanActivate() const = 0;
 
+  virtual bool WidgetSizeIsClientSize() const = 0;
+
   // Returns true if the delegate has a focus saving mechanism that should be
   // used when the window is activated and deactivated.
   virtual bool CanSaveFocus() const = 0;
@@ -88,6 +89,9 @@
   // new state.
   virtual void HandleActivationChanged(bool active) = 0;
 
+  // Called when the user clicks on the window with the mouse to activate it.
+  virtual void HandleMouseActivate(int hittest_code) = 0;
+
   // Called when a well known "app command" from the system was performed.
   // Returns true if the command was handled.
   virtual bool HandleAppCommand(short command) = 0;
@@ -179,10 +183,22 @@
                                       WPARAM w_param,
                                       LPARAM l_param) = 0;
 
-  // This is provided for methods that need to call private methods on NWW.
-  // TODO(beng): should be removed once HWNDMessageHandler is the WindowImpl.
-  virtual NativeWidgetWin* AsNativeWidgetWin() = 0;
+  // Called when the windows session is ending.
+  virtual void HandleEndSession() = 0;
 
+  // Called when a native menu is opened to perform initialization.
+  virtual void HandleInitMenuPopup() = 0;
+
+  // Called when the window's frame has changed.
+  virtual void HandleFrameChanged() = 0;
+
+  // Catch-all. Called before handling any messages. Returns true if the
+  // message should not be processed further, returning the value in |result|.

[sky, 2012/08/27 23:36:04]

nit: clarify 'returning the value' applies to OnWndProc, not the return value of
this function.

+  virtual bool HandleMSG(UINT message,
+                         WPARAM w_param,
+                         LPARAM l_param,
+                         LRESULT* result) = 0;
+
  protected:
   virtual ~HWNDMessageHandlerDelegate() {}
 };