Make HWNDMessageHandler subclass WindowImpl.

ui/views/win/hwnd_message_handler_delegate.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_DELEGATE_H_
 #define UI_VIEWS_WIN_HWND_MESSAGE_HANDLER_DELEGATE_H_
 
 #include "ui/views/views_export.h"
 
 namespace gfx {
 class Insets;
 class Path;
 class Point;
 class Size;
 }
 
 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.
 class VIEWS_EXPORT HWNDMessageHandlerDelegate {
  public:
   virtual bool IsWidgetWindow() const = 0;
 
   // TODO(beng): resolve this more satisfactorily vis-a-vis ShouldUseNativeFrame
   //             to avoid confusion.
   virtual bool IsUsingCustomFrame() const = 0;
 
   virtual void SchedulePaint() = 0;
   virtual void EnableInactiveRendering() = 0;
   virtual bool IsInactiveRenderingDisabled() = 0;
 
   virtual bool CanResize() const = 0;
   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;
   virtual void SaveFocusOnDeactivate() = 0;
   virtual void RestoreFocusOnActivate() = 0;
   virtual void RestoreFocusOnEnable() = 0;
 
   // Returns true if the delegate represents a modal window.
   virtual bool IsModal() const = 0;
 
@@ skipping 31 matching lines @@
   // TODO(beng): Investigate migrating these methods to On* prefixes once
   // HWNDMessageHandler is the WindowImpl.
 
   // Called when another app was activated.
   virtual void HandleAppDeactivated() = 0;
 
   // Called when the window was activated or deactivated. |active| reflects the
   // 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;
 
   // Called when the window has lost mouse capture.
   virtual void HandleCaptureLost() = 0;
 
   // Called when the user tried to close the window.
   virtual void HandleClose() = 0;
 
@@ skipping 71 matching lines @@
   // Called to forward a WM_NOTIFY message to the tooltip manager.
   virtual bool HandleTooltipNotify(int w_param,
                                    NMHDR* l_param,
                                    LRESULT* l_result) = 0;
 
   // Called to forward mouse events to the tooltip manager.
   virtual void HandleTooltipMouseMove(UINT message,
                                       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() {}
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIN_HWND_MESSAGE_HANDLER_DELEGATE_H_