Make HWNDMessageHandler subclass WindowImpl.

chrome/browser/ui/views/frame/browser_frame_win.cc

 // 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.
 
 #include "chrome/browser/ui/views/frame/browser_frame_win.h"
 
 #include <dwmapi.h>
 #include <shellapi.h>
 #include <set>
 
@@ skipping 177 matching lines @@
   return true;
 }
 
 void BrowserFrameWin::UpdateFrameAfterFrameChange() {
   // We need to update the glass region on or off before the base class adjusts
   // the window region.
   UpdateDWMFrame();
   NativeWidgetWin::UpdateFrameAfterFrameChange();
 }
 
-void BrowserFrameWin::OnEndSession(BOOL ending, UINT logoff) {
-  browser::SessionEnding();
+bool BrowserFrameWin::PreHandleMSG(UINT message,
+                                   WPARAM w_param,
+                                   LPARAM l_param,
+                                   LRESULT* result) {
+  switch (message) {
+  case WM_ENDSESSION:
+    browser::SessionEnding();
+    return true;
+  case WM_INITMENUPOPUP:
+    system_menu_->UpdateStates();
+    return true;
+  case WM_ACTIVATE:
+    if (LOWORD(w_param) != WA_INACTIVE)
+      CacheMinimizeButtonDelta();
+    return false;
+  }
+  return false;
 }
 
-void BrowserFrameWin::OnInitMenuPopup(HMENU menu, UINT position,
-                                      BOOL is_system_menu) {
-  system_menu_->UpdateStates();
-}
+void BrowserFrameWin::PostHandleMSG(UINT message,
+                                    WPARAM w_param,
+                                    LPARAM l_param) {
+  switch (message) {
+  case WM_WINDOWPOSCHANGED:
+    UpdateDWMFrame();
 
-void BrowserFrameWin::OnWindowPosChanged(WINDOWPOS* window_pos) {
-  NativeWidgetWin::OnWindowPosChanged(window_pos);
-  UpdateDWMFrame();
-
-  // Windows lies to us about the position of the minimize button before a
-  // window is visible.  We use this position to place the OTR avatar in RTL
-  // mode, so when the window is shown, we need to re-layout and schedule a
-  // paint for the non-client frame view so that the icon top has the correct
-  // position when the window becomes visible.  This fixes bugs where the icon
-  // appears to overlay the minimize button.
-  // Note that we will call Layout every time SetWindowPos is called with
-  // SWP_SHOWWINDOW, however callers typically are careful about not specifying
-  // this flag unless necessary to avoid flicker.
-  // This may be invoked during creation on XP and before the non_client_view
-  // has been created.
-  if (window_pos->flags & SWP_SHOWWINDOW && GetWidget()->non_client_view()) {
-    GetWidget()->non_client_view()->Layout();
-    GetWidget()->non_client_view()->SchedulePaint();
+    // Windows lies to us about the position of the minimize button before a
+    // window is visible.  We use this position to place the OTR avatar in RTL
+    // mode, so when the window is shown, we need to re-layout and schedule a
+    // paint for the non-client frame view so that the icon top has the correct
+    // position when the window becomes visible.  This fixes bugs where the icon
+    // appears to overlay the minimize button.
+    // Note that we will call Layout every time SetWindowPos is called with
+    // SWP_SHOWWINDOW, however callers typically are careful about not
+    // specifying this flag unless necessary to avoid flicker.
+    // This may be invoked during creation on XP and before the non_client_view
+    // has been created.
+    WINDOWPOS* window_pos = reinterpret_cast<WINDOWPOS*>(l_param);
+    if (window_pos->flags & SWP_SHOWWINDOW && GetWidget()->non_client_view()) {
+      GetWidget()->non_client_view()->Layout();
+      GetWidget()->non_client_view()->SchedulePaint();
+    }
+    break;
   }
 }
 
 void BrowserFrameWin::OnScreenReaderDetected() {
   BrowserAccessibilityState::GetInstance()->OnScreenReaderDetected();
   NativeWidgetWin::OnScreenReaderDetected();
 }
 
 bool BrowserFrameWin::ShouldUseNativeFrame() const {
   // App panel windows draw their own frame.
@@ skipping 27 matching lines @@
 void BrowserFrameWin::ShowWithWindowState(ui::WindowShowState show_state) {
   AdjustFrameForImmersiveMode();
   views::NativeWidgetWin::ShowWithWindowState(show_state);
 }
 
 void BrowserFrameWin::Close() {
   CloseImmersiveFrame();
   views::NativeWidgetWin::Close();
 }
 
-void BrowserFrameWin::OnActivate(UINT action, BOOL minimized, HWND window) {
-  if (action != WA_INACTIVE)
-    CacheMinimizeButtonDelta();
-  views::NativeWidgetWin::OnActivate(action, minimized, window);
-}
-
 void BrowserFrameWin::FrameTypeChanged() {
   // In Windows 8 metro mode the frame type is set to FRAME_TYPE_FORCE_CUSTOM
   // by default. We reset it back to FRAME_TYPE_DEFAULT to ensure that we
   // don't end up defaulting to BrowserNonClientFrameView in all cases.
   if (base::win::IsMetroProcess())
     browser_frame_->set_frame_type(views::Widget::FRAME_TYPE_DEFAULT);
 
   views::NativeWidgetWin::FrameTypeChanged();
 
   // In Windows 8 metro mode we call Show on the BrowserFrame instance to
@@ skipping 51 matching lines @@
   if (minimize_button_offset > 0)
     return minimize_button_offset;
 
   // If we fail to get the minimize button offset via the WM_GETTITLEBARINFOEX
   // message then calculate and return this via the
   // cached_minimize_button_x_delta_ member value. Please see
   // CacheMinimizeButtonDelta() for more details.
   DCHECK(cached_minimize_button_x_delta_);
 
   RECT client_rect = {0};
-  GetClientRect(&client_rect);
+  GetClientRect(GetNativeView(), &client_rect);
 
   if (base::i18n::IsRTL())
     return cached_minimize_button_x_delta_;
   else
     return client_rect.right - cached_minimize_button_x_delta_;
 }
 
 void BrowserFrameWin::TabStripDisplayModeChanged() {
   UpdateDWMFrame();
 }
@@ skipping 212 matching lines @@
   current_tab_info->url = base::win::LocalAllocAndCopyString(
       UTF8ToWide(current_tab->GetURL().spec()));
 }
 
 void BrowserFrameWin::CacheMinimizeButtonDelta() {
   int minimize_offset = GetMinimizeButtonOffsetForWindow(GetNativeView());
   if (!minimize_offset)
     return;
 
   RECT rect = {0};
-  GetClientRect(&rect);
+  GetClientRect(GetNativeView(), &rect);
   // Calculate and cache the value of the minimize button delta, i.e. the
   // offset to be applied to the left or right edge of the client rect
   // depending on whether the language is RTL or not.
   // This cached value is only used if the WM_GETTITLEBARINFOEX message fails
   // to get the offset of the minimize button.
   if (base::i18n::IsRTL())
     cached_minimize_button_x_delta_ = minimize_offset;
   else
     cached_minimize_button_x_delta_ = rect.right - minimize_offset;
 }
@@ skipping 10 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeBrowserFrame, public:
 
 // static
 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameWin(browser_frame, browser_view);
 }