Make HWNDMessageHandler subclass WindowImpl.

chrome/browser/ui/views/frame/browser_frame_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 CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/views/frame/browser_frame.h"
@@ skipping 29 matching lines @@
   // Explicitly sets how windows are shown. Use a value of -1 to give the
   // default behavior. This is used during testing and not generally useful
   // otherwise.
   static void SetShowState(int state);
 
  protected:
   // Overridden from views::NativeWidgetWin:
   virtual int GetInitialShowState() const OVERRIDE;
   virtual bool GetClientAreaInsets(gfx::Insets* insets) const OVERRIDE;
   virtual void UpdateFrameAfterFrameChange() OVERRIDE;
-  virtual void OnEndSession(BOOL ending, UINT logoff) OVERRIDE;
-  virtual void OnInitMenuPopup(HMENU menu,
-                               UINT position,
-                               BOOL is_system_menu) OVERRIDE;
-  virtual void OnWindowPosChanged(WINDOWPOS* window_pos) OVERRIDE;
+  virtual void HandleEndSession() OVERRIDE;
+  virtual void HandleInitMenuPopup() OVERRIDE;
+  virtual void HandleVisibilityChanged(bool visible) OVERRIDE;
+  virtual void HandleFrameChanged() OVERRIDE;
+  virtual bool HandleMSG(UINT message,
+                         WPARAM w_param,
+                         LPARAM l_param,
+                         LRESULT* result) OVERRIDE;
+
   virtual void OnScreenReaderDetected() OVERRIDE;
   virtual bool ShouldUseNativeFrame() const OVERRIDE;
   virtual void Show() OVERRIDE;
   virtual void ShowMaximizedWithBounds(
       const gfx::Rect& restored_bounds) OVERRIDE;
   virtual void ShowWithWindowState(ui::WindowShowState show_state) OVERRIDE;
   virtual void Close() OVERRIDE;
-  virtual void OnActivate(UINT action, BOOL minimized, HWND window) OVERRIDE;
+  virtual void HandleActivationChanged(bool active) OVERRIDE;
   virtual void FrameTypeChanged() OVERRIDE;
   virtual void SetFullscreen(bool fullscreen) OVERRIDE;
 
   // Overridden from NativeBrowserFrame:
   virtual views::NativeWidget* AsNativeWidget() OVERRIDE;
   virtual const views::NativeWidget* AsNativeWidget() const OVERRIDE;
   virtual void InitSystemContextMenu() OVERRIDE;
   virtual int GetMinimizeButtonOffset() const OVERRIDE;
   virtual void TabStripDisplayModeChanged() OVERRIDE;
 
   // Overriden from views::ImageButton override:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
-  // Overridden from WindowImpl:
-  virtual LRESULT OnWndProc(UINT message,
-                            WPARAM w_param,
-                            LPARAM l_param) OVERRIDE;
-
  private:
   // Updates the DWM with the frame bounds.
   void UpdateDWMFrame();
 
   // Builds the correct menu for when we have minimal chrome.
   void BuildSystemMenuForBrowserWindow();
   void BuildSystemMenuForAppOrPopupWindow();
 
   // Adds optional debug items for frame type toggling.
   void AddFrameToggleItems();
@@ skipping 29 matching lines @@
   // The wrapped system menu itself.
   scoped_ptr<views::NativeMenuWin> system_menu_;
 
   // See CacheMinimizeButtonDelta() for details about this member.
   int cached_minimize_button_x_delta_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserFrameWin);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_WIN_H_