Move more code from NWW to HWNDMessageHandler.

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>
@@ skipping 406 matching lines @@
   virtual void OnThemeChanged();
   virtual LRESULT OnTouchEvent(UINT message, WPARAM w_param, LPARAM l_param);
   virtual void OnVScroll(int scroll_type, short position, HWND scrollbar);
   virtual void OnWindowPosChanging(WINDOWPOS* window_pos);
   virtual void OnWindowPosChanged(WINDOWPOS* window_pos);
 
   // Deletes this window as it is destroyed, override to provide different
   // behavior.
   virtual void OnFinalMessage(HWND window);
 
-  // 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;
-
   // Called when a MSAA screen reader client is detected.
   virtual void OnScreenReaderDetected();
 
   // The TooltipManager. This is NULL if there is a problem creating the
   // underlying tooltip window.
   // WARNING: RootView's destructor calls into the TooltipManager. As such, this
   // must be destroyed AFTER root_view_.
   scoped_ptr<TooltipManagerWin> tooltip_manager_;
 
   scoped_refptr<DropTargetWin> drop_target_;
 
   // 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 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;
   virtual void GetMinMaxSize(gfx::Size* min_size,
                              gfx::Size* max_size) const OVERRIDE;
   virtual gfx::Size GetRootViewSize() const OVERRIDE;
   virtual void ResetWindowControls() OVERRIDE;
   virtual void UpdateFrame() OVERRIDE;
   virtual void PaintLayeredWindow(gfx::Canvas* canvas) OVERRIDE;
   virtual gfx::NativeViewAccessible GetNativeViewAccessible() OVERRIDE;
   virtual InputMethod* GetInputMethod() OVERRIDE;
   virtual void HandleAppDeactivated() OVERRIDE;
   virtual void HandleActivationChanged(bool active) OVERRIDE;
   virtual bool HandleAppCommand(short command) OVERRIDE;
   virtual void HandleCaptureLost() OVERRIDE;
   virtual void HandleClose() OVERRIDE;
   virtual bool HandleCommand(int command) OVERRIDE;
   virtual void HandleAccelerator(const ui::Accelerator& accelerator) OVERRIDE;
   virtual void HandleCreate() OVERRIDE;
-  virtual void HandleDestroy() OVERRIDE;
+  virtual void HandleDestroying() OVERRIDE;
+  virtual void HandleDestroyed() OVERRIDE;
+  virtual bool HandleInitialFocus() OVERRIDE;
   virtual void HandleDisplayChange() OVERRIDE;
   virtual void HandleGlassModeChange() OVERRIDE;
   virtual void HandleBeginWMSizeMove() OVERRIDE;
   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;
@@ skipping 10 matching lines @@
                                       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;
 
-  // 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);
 
   // Determines whether the delegate expects the client size or the window size.
   bool WidgetSizeIsClientSize() const;
 
-  void RestoreEnabledIfNecessary();
-
-  void SetInitialFocus();
-
   // A delegate implementation that handles events received here.
   // See class documentation for Widget in widget.h for a note about ownership.
   internal::NativeWidgetDelegate* delegate_;
 
-  // The following factory is used for calls to close the NativeWidgetWin
-  // instance.
-  base::WeakPtrFactory<NativeWidgetWin> close_widget_factory_;
-
   // See class documentation for Widget in widget.h for a note about ownership.
   Widget::InitParams::Ownership ownership_;
 
-  // Whether the focus should be restored next time we get enabled.  Needed to
-  // restore focus correctly when Windows modal dialogs are displayed.
-  bool restore_focus_when_enabled_;
-
   // Instance of accessibility information and handling for MSAA root
   base::win::ScopedComPtr<IAccessible> accessibility_root_;
 
   // Value determines whether the Widget is customized for accessibility.
   static bool screen_reader_active_;
 
   // The maximum number of view events in our vector below.
   static const int kMaxAccessibilityViewEvents = 20;
 
   // A vector used to access views for which we have sent notifications to
   // accessibility clients.  It is used as a circular queue.
   std::vector<View*> accessibility_view_events_;
 
   // The current position of the view events vector.  When incrementing,
   // we always mod this value with the max view events above .
   int accessibility_view_events_index_;
 
   ViewProps props_;
 
   // The window styles before we modified them for the drag frame appearance.
   DWORD drag_frame_saved_window_style_;
   DWORD drag_frame_saved_window_ex_style_;
 
-  // Whether all ancestors have been enabled. This is only used if is_modal_ is
-  // true.
-  bool restored_enabled_;
-
   // 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_;
 
   scoped_ptr<HWNDMessageHandler> message_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetWin);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WIDGET_NATIVE_WIDGET_WIN_H_