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 181 matching lines @@
   // We need to update the glass region on or off before the base class adjusts
   // the window region.
   UpdateDWMFrame();
   NativeWidgetWin::UpdateFrameAfterFrameChange();
 }
 
 bool BrowserFrameWin::PreHandleMSG(UINT message,
                                    WPARAM w_param,
                                    LPARAM l_param,
                                    LRESULT* result) {
+  static const UINT metro_navigation_search_message =
+      RegisterWindowMessage(chrome::kMetroNavigationAndSearchMessage);
+
+  static const UINT metro_get_current_tab_info_message =
+      RegisterWindowMessage(chrome::kMetroGetCurrentTabInfoMessage);
+
+  if (message == metro_navigation_search_message) {
+    HandleMetroNavSearchRequest(w_param, l_param);
+    return false;
+  } else if (message == metro_get_current_tab_info_message) {
+    GetMetroCurrentTabInfo(w_param);
+    return false;
+  }
+
   switch (message) {
+  case WM_ACTIVATE:
+    if (LOWORD(w_param) != WA_INACTIVE)
+      CacheMinimizeButtonDelta();
+    return false;
+  case WM_PRINT:
+    if (base::win::IsMetroProcess()) {
+      // This message is sent by the AnimateWindow API which is used in metro
+      // mode to flip between active chrome windows.
+      RECT client_rect = {0};
+      ::GetClientRect(GetNativeView(), &client_rect);
+      HDC dest_dc = reinterpret_cast<HDC>(w_param);
+      DCHECK(dest_dc);
+      HDC src_dc = ::GetDC(GetNativeView());
+      ::BitBlt(dest_dc, 0, 0, client_rect.right - client_rect.left,
+               client_rect.bottom - client_rect.top, src_dc, 0, 0,
+               SRCCOPY);
+      ::ReleaseDC(GetNativeView(), src_dc);
+      *result = 0;
+      return true;
+    }
+    return false;
   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::PostHandleMSG(UINT message,
                                     WPARAM w_param,
                                     LPARAM l_param) {
   switch (message) {
   case WM_WINDOWPOSCHANGED:
     UpdateDWMFrame();
@@ skipping 151 matching lines @@
   if (!metro)
     return;
   // Tell the metro_driver to flip our window. This causes the current
   // browser window to be hidden and the next window to be shown.
   static FlipFrameWindows flip_window_fn = reinterpret_cast<FlipFrameWindows>(
       ::GetProcAddress(metro, "FlipFrameWindows"));
   if (flip_window_fn)
     flip_window_fn();
 }
 
-LRESULT BrowserFrameWin::OnWndProc(UINT message,
-                                   WPARAM w_param,
-                                   LPARAM l_param) {
-  static const UINT metro_navigation_search_message =
-      RegisterWindowMessage(chrome::kMetroNavigationAndSearchMessage);
-
-  static const UINT metro_get_current_tab_info_message =
-      RegisterWindowMessage(chrome::kMetroGetCurrentTabInfoMessage);
-
-  if (message == metro_navigation_search_message) {
-    HandleMetroNavSearchRequest(w_param, l_param);
-  } else if (message == metro_get_current_tab_info_message) {
-    GetMetroCurrentTabInfo(w_param);
-  } else if (message == WM_PRINT && base::win::IsMetroProcess()) {
-    // This message is sent by the AnimateWindow API which is used in metro
-    // mode to flip between active chrome windows.
-    RECT client_rect = {0};
-    ::GetClientRect(GetNativeView(), &client_rect);
-    HDC dest_dc = reinterpret_cast<HDC>(w_param);
-    DCHECK(dest_dc);
-    HDC src_dc = ::GetDC(GetNativeView());
-    ::BitBlt(dest_dc, 0, 0, client_rect.right - client_rect.left,
-             client_rect.bottom - client_rect.top, src_dc, 0, 0,
-             SRCCOPY);
-    ::ReleaseDC(GetNativeView(), src_dc);
-    return 0;
-  }
-  return views::NativeWidgetWin::OnWndProc(message, w_param, l_param);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameWin, private:
 
 void BrowserFrameWin::UpdateDWMFrame() {
   // For "normal" windows on Aero, we always need to reset the glass area
   // correctly, even if we're not currently showing the native frame (e.g.
   // because a theme is showing), so we explicitly check for that case rather
   // than checking browser_frame_->ShouldUseNativeFrame() here.  Using that here
   // would mean we wouldn't reset the glass area to zero when moving from the
   // native frame to an opaque frame, leading to graphical glitches behind the
@@ skipping 189 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeBrowserFrame, public:
 
 // static
 NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
     BrowserFrame* browser_frame,
     BrowserView* browser_view) {
   return new BrowserFrameWin(browser_frame, browser_view);
 }