Begin to move some message handling from NWW onto a framework-agnostic HWND Message handler.

ui/views/widget/native_widget_win.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_WIDGET_NATIVE_WIDGET_WIN_H_
 #define UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlmisc.h>
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/win_util.h"
 #include "ui/base/win/window_impl.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/layout/layout_manager.h"
+#include "ui/views/widget/hwnd_message_handler_delegate.h"
 #include "ui/views/widget/native_widget_private.h"
 
 namespace ui {
 class Compositor;
 class ViewProp;
 }
 
 namespace gfx {
 class Canvas;
 class Font;
 class Rect;
 }
 
 namespace views {
 
 class DropTargetWin;
+class HWNDMessageHandler;
 class RootView;
 class TooltipManagerWin;
 
 // These two messages aren't defined in winuser.h, but they are sent to windows
 // with captions. They appear to paint the window caption and frame.
 // Unfortunately if you override the standard non-client rendering as we do
 // with CustomFrameWindow, sometimes Windows (not deterministically
 // reproducibly but definitely frequently) will send these messages to the
 // window and paint the standard caption/title over the top of the custom one.
 // So we need to handle these messages in CustomFrameWindow to prevent this
 // from happening.
 const int WM_NCUAHDRAWCAPTION = 0xAE;
 const int WM_NCUAHDRAWFRAME = 0xAF;
 
 ///////////////////////////////////////////////////////////////////////////////
 //
 // NativeWidgetWin
 //  A Widget for a views hierarchy used to represent anything that can be
 //  contained within an HWND, e.g. a control, a window, etc. Specializations
 //  suitable for specific tasks, e.g. top level window, are derived from this.
 //
 //  This Widget contains a RootView which owns the hierarchy of views within it.
 //  As long as views are part of this tree, they will be deleted automatically
 //  when the RootView is destroyed. If you remove a view from the tree, you are
 //  then responsible for cleaning up after it.
 //
 ///////////////////////////////////////////////////////////////////////////////
 class VIEWS_EXPORT NativeWidgetWin : public ui::WindowImpl,
                                      public MessageLoopForUI::Observer,
-                                     public internal::NativeWidgetPrivate {
+                                     public internal::NativeWidgetPrivate,
+                                     public HWNDMessageHandlerDelegate {
  public:
   explicit NativeWidgetWin(internal::NativeWidgetDelegate* delegate);
   virtual ~NativeWidgetWin();
 
   // Returns true if we are on Windows Vista or greater and composition is
   // enabled.
   static bool IsAeroGlassEnabled();
 
   // Returns the system set window title font.
   static gfx::Font GetWindowTitleFont();
@@ skipping 393 matching lines @@
   const gfx::Rect& invalid_rect() const { return invalid_rect_; }
 
   // Saved window information from before entering fullscreen mode.
   // TODO(beng): move to private once GetRestoredBounds() moves onto Widget.
   SavedWindowInfo saved_window_info_;
 
  private:
   typedef ScopedVector<ui::ViewProp> ViewProps;
   typedef std::set<DWORD> TouchIDs;
 
+  // TODO(beng): This friendship can be removed once all methods relating to
+  //             this object being a WindowImpl are moved to HWNDMessageHandler.
+  friend HWNDMessageHandler;
+
+  // Overridden from HWNDMessageHandlerDelegate:
+  virtual bool IsWidgetWindow() const OVERRIDE;
+  virtual bool IsUsingCustomFrame() const OVERRIDE;
+  virtual void HandleAppDeactivated() OVERRIDE;
+  virtual bool HandleAppCommand(short command) OVERRIDE;
+  virtual void HandleCaptureLost() OVERRIDE;
+  virtual void HandleClose() OVERRIDE;
+  virtual bool HandleCommand(int command) OVERRIDE;
+  virtual void HandleDestroy() OVERRIDE;
+  virtual void HandleDisplayChange() OVERRIDE;
+  virtual void HandleGlassModeChange() OVERRIDE;
+  virtual void HandleBeginWMSizeMove() OVERRIDE;
+  virtual void HandleEndWMSizeMove() OVERRIDE;
+  virtual NativeWidgetWin* AsNativeWidgetWin() OVERRIDE;
+
   // Called after the WM_ACTIVATE message has been processed by the default
   // windows procedure.
   static void PostProcessActivateMessage(NativeWidgetWin* widget,
                                          int activation_state);
 
   void SetInitParams(const Widget::InitParams& params);
 
   // Synchronously paints the invalid contents of the Widget.
   void RedrawInvalidRect();
 
@@ skipping 174 matching lines @@
   // This flag can be initialized and checked after certain operations (such as
   // DefWindowProc) to avoid stack-controlled NativeWidgetWin operations (such
   // as unlocking the Window with a ScopedRedrawLock) after Widget destruction.
   bool* destroyed_;
 
   // True if the widget is going to have a non_client_view. We cache this value
   // rather than asking the Widget for the non_client_view so that we know at
   // Init time, before the Widget has created the NonClientView.
   bool has_non_client_view_;
 
-  bool remove_standard_frame_;
-
   // The set of touch devices currently down.
   TouchIDs touch_ids_;
 
+  scoped_ptr<HWNDMessageHandler> message_handler_;
+
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_