Make HWNDMessageHandler subclass WindowImpl.

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/native_widget_private.h"
 #include "ui/views/win/hwnd_message_handler_delegate.h"
 
 namespace ui {
 class Compositor;
@@ skipping 32 matching lines @@
 //  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 HWNDMessageHandlerDelegate {
  public:
   explicit NativeWidgetWin(internal::NativeWidgetDelegate* delegate);
   virtual ~NativeWidgetWin();
 
   // Returns the system set window title font.
   static gfx::Font GetWindowTitleFont();
 
   // Show the window with the specified show command.
@@ skipping 17 matching lines @@
 
   // Places the window in a pseudo-fullscreen mode where it looks and acts as
   // like a fullscreen window except that it remains within the boundaries
   // of the metro snap divider.
   void SetMetroSnapFullscreen(bool metro_snap);
 
   bool IsInMetroSnapMode() const;
 
   void SetCanUpdateLayeredWindow(bool can_update);
 
-  BOOL IsWindow() const {
-    return ::IsWindow(GetNativeView());
-  }
-
-  BOOL ShowWindow(int command) {
-    DCHECK(::IsWindow(GetNativeView()));
-    return ::ShowWindow(GetNativeView(), command);
-  }
-
-  HWND GetParent() const {
-    return ::GetParent(GetNativeView());
-  }
-
-  LONG GetWindowLong(int index) {
-    DCHECK(::IsWindow(GetNativeView()));
-    return ::GetWindowLong(GetNativeView(), index);
-  }
-
-  BOOL GetWindowRect(RECT* rect) const {
-    return ::GetWindowRect(GetNativeView(), rect);
-  }
-
-  LONG SetWindowLong(int index, LONG new_long) {
-    DCHECK(::IsWindow(GetNativeView()));
-    return ::SetWindowLong(GetNativeView(), index, new_long);
-  }
-
-  BOOL SetWindowPos(HWND hwnd_after, int x, int y, int cx, int cy, UINT flags) {
-    DCHECK(::IsWindow(GetNativeView()));
-    return ::SetWindowPos(GetNativeView(), hwnd_after, x, y, cx, cy, flags);
-  }
-
-  BOOL IsZoomed() const {
-    DCHECK(::IsWindow(GetNativeView()));
-    return ::IsZoomed(GetNativeView());
-  }
-
-  BOOL MoveWindow(int x, int y, int width, int height) {
-    return MoveWindow(x, y, width, height, TRUE);
-  }
-
-  BOOL MoveWindow(int x, int y, int width, int height, BOOL repaint) {
-    DCHECK(::IsWindow(GetNativeView()));
-    return ::MoveWindow(GetNativeView(), x, y, width, height, repaint);
-  }
-
-  int SetWindowRgn(HRGN region, BOOL redraw) {
-    DCHECK(::IsWindow(GetNativeView()));
-    return ::SetWindowRgn(GetNativeView(), region, redraw);
-  }
-
-  BOOL GetClientRect(RECT* rect) const {
-    DCHECK(::IsWindow(GetNativeView()));
-    return ::GetClientRect(GetNativeView(), rect);
-  }
-
   // Overridden from internal::NativeWidgetPrivate:
   virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE;
   virtual NonClientFrameView* CreateNonClientFrameView() OVERRIDE;
   virtual void UpdateFrameAfterFrameChange() OVERRIDE;
   virtual bool ShouldUseNativeFrame() const OVERRIDE;
   virtual void FrameTypeChanged() OVERRIDE;
   virtual Widget* GetWidget() OVERRIDE;
   virtual const Widget* GetWidget() const OVERRIDE;
   virtual gfx::NativeView GetNativeView() const OVERRIDE;
   virtual gfx::NativeWindow GetNativeWindow() const OVERRIDE;
@@ skipping 68 matching lines @@
   virtual void ClearNativeFocus() OVERRIDE;
   virtual void FocusNativeView(gfx::NativeView native_view) OVERRIDE;
   virtual gfx::Rect GetWorkAreaBoundsInScreen() const OVERRIDE;
   virtual void SetInactiveRenderingDisabled(bool value) OVERRIDE;
   virtual Widget::MoveLoopResult RunMoveLoop(
       const gfx::Point& drag_offset) OVERRIDE;
   virtual void EndMoveLoop() OVERRIDE;
   virtual void SetVisibilityChangedAnimationsEnabled(bool value) OVERRIDE;
 
  protected:
-  // Overridden from MessageLoop::Observer:
-  virtual base::EventStatus WillProcessEvent(
-      const base::NativeEvent& event) OVERRIDE;
-  virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;
-
   // Overridden from WindowImpl:
   virtual HICON GetDefaultWindowIcon() const OVERRIDE;
   virtual LRESULT OnWndProc(UINT message,
                             WPARAM w_param,
                             LPARAM l_param) OVERRIDE;
 
   // Message Handlers ----------------------------------------------------------
 
   BEGIN_MSG_MAP_EX(NativeWidgetWin)
     // Range handlers must go first!
@@ skipping 166 matching lines @@
 
   // Overridden from HWNDMessageHandlerDelegate:
   virtual bool IsWidgetWindow() const OVERRIDE;
   virtual bool IsUsingCustomFrame() const OVERRIDE;
   virtual void SchedulePaint() OVERRIDE;
   virtual void EnableInactiveRendering() OVERRIDE;
   virtual bool IsInactiveRenderingDisabled() OVERRIDE;
   virtual bool CanResize() const OVERRIDE;
   virtual bool CanMaximize() const OVERRIDE;
   virtual bool CanActivate() const OVERRIDE;
+  virtual bool WidgetSizeIsClientSize() const OVERRIDE;
   virtual bool CanSaveFocus() const OVERRIDE;
   virtual void SaveFocusOnDeactivate() OVERRIDE;
   virtual void RestoreFocusOnActivate() OVERRIDE;
   virtual void RestoreFocusOnEnable() OVERRIDE;
   virtual bool IsModal() const OVERRIDE;
   virtual int GetInitialShowState() const OVERRIDE;
   virtual bool WillProcessWorkAreaChange() const OVERRIDE;
   virtual int GetNonClientComponent(const gfx::Point& point) const OVERRIDE;
   virtual void GetWindowMask(const gfx::Size& size, gfx::Path* path) OVERRIDE;
   virtual bool GetClientAreaInsets(gfx::Insets* insets) const OVERRIDE;
@@ skipping 30 matching lines @@
   virtual bool HandleKeyEvent(const ui::KeyEvent& event) OVERRIDE;
   virtual bool HandlePaintAccelerated(const gfx::Rect& invalid_rect) OVERRIDE;
   virtual void HandlePaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void HandleScreenReaderDetected() OVERRIDE;
   virtual bool HandleTooltipNotify(int w_param,
                                    NMHDR* l_param,
                                    LRESULT* l_result) OVERRIDE;
   virtual void HandleTooltipMouseMove(UINT message,
                                       WPARAM w_param,
                                       LPARAM l_param) OVERRIDE;
+  virtual bool PreHandleMSG(UINT message,
+                            WPARAM w_param,
+                            LPARAM l_param,
+                            LRESULT* result) OVERRIDE;
+  virtual void PostHandleMSG(UINT message,
+                             WPARAM w_param,
+                             LPARAM l_param) OVERRIDE;
   virtual NativeWidgetWin* AsNativeWidgetWin() OVERRIDE;
 
  private:
   typedef ScopedVector<ui::ViewProp> ViewProps;
 
   // TODO(beng): This friendship can be removed once all methods relating to
   //             this object being a WindowImpl are moved to HWNDMessageHandler.
   friend HWNDMessageHandler;
 
   void SetInitParams(const Widget::InitParams& params);
 
-  // Determines whether the delegate expects the client size or the window size.
-  bool WidgetSizeIsClientSize() const;
-
   // A delegate implementation that handles events received here.
   // See class documentation for Widget in widget.h for a note about ownership.
   internal::NativeWidgetDelegate* delegate_;
 
   // See class documentation for Widget in widget.h for a note about ownership.
   Widget::InitParams::Ownership ownership_;
 
   // Instance of accessibility information and handling for MSAA root
   base::win::ScopedComPtr<IAccessible> accessibility_root_;
 
@@ skipping 23 matching lines @@
   bool has_non_client_view_;
 
   scoped_ptr<HWNDMessageHandler> message_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_