Move more methods from NWW to HWNDMessageHandler.

ui/views/widget/native_widget_win.h

Index: ui/views/widget/native_widget_win.h
===================================================================
--- ui/views/widget/native_widget_win.h	(revision 152769)
+++ ui/views/widget/native_widget_win.h	(working copy)
@@ -42,6 +42,7 @@
 
 class DropTargetWin;
 class HWNDMessageHandler;
+class InputMethodDelegate;
 class RootView;
 class TooltipManagerWin;
 
@@ -77,10 +78,6 @@
   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();
 
@@ -208,6 +205,7 @@
   virtual void ReleaseCapture() OVERRIDE;
   virtual bool HasCapture() const OVERRIDE;
   virtual InputMethod* CreateInputMethod() OVERRIDE;
+  virtual internal::InputMethodDelegate* GetInputMethodDelegate() OVERRIDE;
   virtual void CenterWindow(const gfx::Size& size) OVERRIDE;
   virtual void GetWindowPlacement(
      gfx::Rect* bounds,
@@ -459,10 +457,6 @@
   // crazily complicated.
   virtual gfx::Insets GetClientAreaInsets() const;
 
-  // Start tracking all mouse events so that this window gets sent mouse leave
-  // messages too.
-  void TrackMouseEvents(DWORD mouse_tracking_flags);
-
   // Called when a MSAA screen reader client is detected.
   virtual void OnScreenReaderDetected();
 
@@ -485,7 +479,6 @@
 
  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.
@@ -521,12 +514,19 @@
   virtual void HandleEndWMSizeMove() OVERRIDE;
   virtual void HandleMove() OVERRIDE;
   virtual void HandleWorkAreaChanged() OVERRIDE;
+  virtual void HandleVisibilityChanged(bool visible) OVERRIDE;
+  virtual void HandleClientSizeChanged(const gfx::Size& new_size) OVERRIDE;
   virtual void HandleNativeFocus(HWND last_focused_window) OVERRIDE;
   virtual void HandleNativeBlur(HWND focused_window) OVERRIDE;
+  virtual bool HandleMouseEvent(const ui::MouseEvent& event) OVERRIDE;
+  virtual bool HandleKeyEvent(const ui::KeyEvent& event) 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 NativeWidgetWin* AsNativeWidgetWin() OVERRIDE;
 
   // Called after the WM_ACTIVATE message has been processed by the default
@@ -543,30 +543,9 @@
   // layered windows only.
   void RedrawLayeredWindowContents();
 
-  // Lock or unlock the window from being able to redraw itself in response to
-  // updates to its invalid region.
-  class ScopedRedrawLock;
-  void LockUpdates(bool force);
-  void UnlockUpdates(bool force);
-
   // Determines whether the delegate expects the client size or the window size.
   bool WidgetSizeIsClientSize() const;
 
-  // Responds to the client area changing size, either at window creation time
-  // or subsequently.
-  void ClientAreaSizeChanged();
-
-  // When removing the standard frame, tells the DWM how much glass we want on
-  // the edges. Currently hardcoded to 10px on all sides.
-  void UpdateDWMFrame();
-
-  // Calls DefWindowProc, safely wrapping the call in a ScopedRedrawLock to
-  // prevent frame flicker. DefWindowProc handling can otherwise render the
-  // classic-look window title bar directly.
-  LRESULT DefWindowProcWithRedrawLock(UINT message,
-                                      WPARAM w_param,
-                                      LPARAM l_param);
-
   // Stops ignoring SetWindowPos() requests (see below).
   void StopIgnoringPosChanges() { ignore_window_pos_changes_ = false; }
 
@@ -577,9 +556,6 @@
   // Notifies any owned windows that we're closing.
   void NotifyOwnedWindowsParentClosing();
 
-  // Overridden from internal::InputMethodDelegate
-  virtual void DispatchKeyEventPostIME(const ui::KeyEvent& key) OVERRIDE;
-
   // Common implementation of fullscreen-related code. This method handles
   // changing from windowed mode to a display mode (dubbed fullscreen mode)
   // where the window occupies a fixed portion (possibly 100%) of the screen.
@@ -596,11 +572,6 @@
   // instance.
   base::WeakPtrFactory<NativeWidgetWin> close_widget_factory_;
 
-  // The flags currently being used with TrackMouseEvent to track mouse
-  // messages. 0 if there is no active tracking. The value of this member is
-  // used when tracking is canceled.
-  DWORD active_mouse_tracking_flags_;
-
   // Should we keep an off-screen buffer? This is false by default, set to true
   // when WS_EX_LAYERED is specified before the native window is created.
   //
@@ -682,10 +653,6 @@
   DWORD drag_frame_saved_window_style_;
   DWORD drag_frame_saved_window_ex_style_;
 
-  // Represents the number of ScopedRedrawLocks active against this widget.
-  // If this is greater than zero, the widget should be locked against updates.
-  int lock_updates_count_;
-
   // When true, this flag makes us discard incoming SetWindowPos() requests that
   // only change our position/size.  (We still allow changes to Z-order,
   // activation, etc.)
@@ -700,27 +667,15 @@
   HMONITOR last_monitor_;
   gfx::Rect last_monitor_rect_, last_work_area_;
 
-  // Set to true when the user presses the right mouse button on the caption
-  // area. We need this so we can correctly show the context menu on mouse-up.
-  bool is_right_mouse_pressed_on_caption_;
-
   // Whether all ancestors have been enabled. This is only used if is_modal_ is
   // true.
   bool restored_enabled_;
 
-  // 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_;
 
-  // The set of touch devices currently down.
-  TouchIDs touch_ids_;
-
   scoped_ptr<HWNDMessageHandler> message_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin);