Move more from Window onto Widget.

views/window/native_window_win.h

Index: views/window/native_window_win.h
===================================================================
--- views/window/native_window_win.h	(revision 88218)
+++ views/window/native_window_win.h	(working copy)
@@ -47,9 +47,6 @@
   explicit NativeWindowWin(internal::NativeWindowDelegate* delegate);
   virtual ~NativeWindowWin();
 
-  // Show the window with the specified show command.
-  void Show(int show_state);
-
   // Returns the system set window title font.
   static gfx::Font GetWindowTitleFont();
 
@@ -60,64 +57,21 @@
  protected:
   friend Window;
 
-  // Returns the insets of the client area relative to the non-client area of
-  // the window. Override this function instead of OnNCCalcSize, which is
-  // crazily complicated.
-  virtual gfx::Insets GetClientAreaInsets() const;
-
-  // Retrieve the show state of the window. This is one of the SW_SHOW* flags
-  // passed into Windows' ShowWindow method. For normal windows this defaults
-  // to SW_SHOWNORMAL, however windows (e.g. the main window) can override this
-  // method to provide different values (e.g. retrieve the user's specified
-  // show state from the shortcut starutp info).
-  virtual int GetShowState() const;
-
   // Overridden from NativeWidgetWin:
   virtual void InitNativeWidget(const Widget::InitParams& params) OVERRIDE;
-  virtual void OnActivateApp(BOOL active, DWORD thread_id) OVERRIDE;
   virtual void OnDestroy() OVERRIDE;
-  virtual LRESULT OnDwmCompositionChanged(UINT msg,
-                                          WPARAM w_param,
-                                          LPARAM l_param) OVERRIDE;
-  virtual void OnEnterSizeMove() OVERRIDE;
-  virtual void OnExitSizeMove() OVERRIDE;
-  virtual void OnGetMinMaxInfo(MINMAXINFO* minmax_info) OVERRIDE;
-  virtual void OnInitMenu(HMENU menu) OVERRIDE;
-  virtual LRESULT OnMouseActivate(UINT message, WPARAM w_param, LPARAM l_param)
-      OVERRIDE;
   virtual LRESULT OnMouseRange(UINT message,
                                WPARAM w_param,
                                LPARAM l_param) OVERRIDE;
-  virtual LRESULT OnNCActivate(BOOL active) OVERRIDE;
   LRESULT OnNCCalcSize(BOOL mode, LPARAM l_param);  // Don't override.
-  virtual LRESULT OnNCHitTest(const CPoint& point) OVERRIDE;
   virtual void OnNCPaint(HRGN rgn) OVERRIDE;
-  virtual LRESULT OnNCUAHDrawCaption(UINT msg,
-                                     WPARAM w_param,
-                                     LPARAM l_param) OVERRIDE;
-  virtual LRESULT OnNCUAHDrawFrame(UINT msg,
-                                   WPARAM w_param,
-                                   LPARAM l_param) OVERRIDE;
-  virtual LRESULT OnSetCursor(UINT message,
-                              WPARAM w_param,
-                              LPARAM l_param) OVERRIDE;
-  virtual LRESULT OnSetIcon(UINT size_type, HICON new_icon) OVERRIDE;
-  virtual LRESULT OnSetText(const wchar_t* text) OVERRIDE;
-  virtual void OnSize(UINT size_param, const CSize& new_size) OVERRIDE;
-  virtual void OnSysCommand(UINT notification_code, CPoint click) OVERRIDE;
   virtual void OnWindowPosChanging(WINDOWPOS* window_pos) OVERRIDE;
 
   // Overridden from NativeWindow:
   virtual NativeWidget* AsNativeWidget() OVERRIDE;
   virtual const NativeWidget* AsNativeWidget() const OVERRIDE;
-  virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
-  virtual void ShowNativeWindow(ShowState state) OVERRIDE;
   virtual void BecomeModal() OVERRIDE;
-  virtual void EnableClose(bool enable) OVERRIDE;
 
-  // Overridden from NativeWidgetWin:
-  virtual bool IsActive() const OVERRIDE;
-
  private:
   // If necessary, enables all ancestors.
   void RestoreEnabledIfNecessary();
@@ -126,12 +80,6 @@
   DWORD CalculateWindowStyle();
   DWORD CalculateWindowExStyle();
 
-  // Lock or unlock the window from being able to redraw itself in response to
-  // updates to its invalid region.
-  class ScopedRedrawLock;
-  void LockUpdates();
-  void UnlockUpdates();
-
   // Stops ignoring SetWindowPos() requests (see below).
   void StopIgnoringPosChanges() { ignore_window_pos_changes_ = false; }
 
@@ -140,11 +88,6 @@
   void UpdateAccessibleRole();
   void UpdateAccessibleState();
 
-  // Calls the default WM_NCACTIVATE handler with the specified activation
-  // value, safely wrapping the call in a ScopedRedrawLock to prevent frame
-  // flicker.
-  LRESULT CallDefaultNCActivateHandler(BOOL active);
-
   // A delegate implementation that handles events received here.
   internal::NativeWindowDelegate* delegate_;
 
@@ -152,15 +95,6 @@
   // true.
   bool restored_enabled_;
 
-  // True if this window is the active top level window.
-  bool is_active_;
-
-  // True if updates to this window are currently locked.
-  bool lock_updates_;
-
-  // The window styles of the window before updates were locked.
-  DWORD saved_window_style_;
-
   // 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.)