Make HWNDMessageHandler subclass WindowImpl.

chrome/browser/ui/views/external_tab_container_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/external_tab_container_win.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 48 matching lines @@
 #include "grit/locale_settings.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/base/view_prop.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/layout/grid_layout.h"
+#include "ui/views/win/hwnd_message_handler.h"
 
 using content::BrowserThread;
 using content::LoadNotificationDetails;
 using content::NativeWebKeyboardEvent;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::OpenURLParams;
 using content::RenderViewHost;
 using content::SSLStatus;
 using content::WebContents;
@@ skipping 78 matching lines @@
                                    HWND parent,
                                    const gfx::Rect& bounds,
                                    DWORD style,
                                    bool load_requests_via_automation,
                                    bool handle_top_level_requests,
                                    TabContents* existing_contents,
                                    const GURL& initial_url,
                                    const GURL& referrer,
                                    bool infobars_enabled,
                                    bool route_all_top_level_navigations) {
-  if (IsWindow()) {
+  if (IsWindow(GetNativeView())) {
     NOTREACHED();
     return false;
   }
 
   load_requests_via_automation_ = load_requests_via_automation;
   handle_top_level_requests_ = handle_top_level_requests;
   route_all_top_level_navigations_ = route_all_top_level_navigations;
 
-  set_window_style(WS_POPUP | WS_CLIPCHILDREN);
+  GetMessageHandler()->set_window_style(WS_POPUP | WS_CLIPCHILDREN);
 
   views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
   params.bounds = bounds;
   params.native_widget = this;
   GetWidget()->Init(params);
-  if (!IsWindow()) {
+  if (!IsWindow(GetNativeView())) {
     NOTREACHED();
     return false;
   }
 
   // TODO(jcampan): limit focus traversal to contents.
 
   prop_.reset(new ViewProp(GetNativeView(), kWindowObjectKey, this));
 
   if (existing_contents) {
     tab_contents_.reset(existing_contents);
@@ skipping 43 matching lines @@
                    weak_factory_.GetWeakPtr(),
                    initial_url, referrer));
   }
 
   // We need WS_POPUP to be on the window during initialization, but
   // once initialized we apply the requested style which may or may not
   // include the popup bit.
   // Note that it's important to do this before we call SetParent since
   // during the SetParent call we will otherwise get a WA_ACTIVATE call
   // that causes us to steal the current focus.
-  SetWindowLong(GWL_STYLE, (GetWindowLong(GWL_STYLE) & ~WS_POPUP) | style);
+  SetWindowLong(GetNativeView(), GWL_STYLE,
+      (GetWindowLong(GetNativeView(), GWL_STYLE) & ~WS_POPUP) | style);
 
   // Now apply the parenting and style
   if (parent)
     SetParent(GetNativeView(), parent);
 
   ::ShowWindow(tab_contents_->web_contents()->GetNativeView(), SW_SHOWNA);
 
   LoadAccelerators();
   SetupExternalTabView();
   tab_contents_->blocked_content_tab_helper()->set_delegate(this);
@@ skipping 327 matching lines @@
     string16 url_string = CA2W(url.spec().c_str());
     automation_->Send(
         new AutomationMsg_UpdateTargetUrl(tab_handle_, url_string));
   }
 }
 
 void ExternalTabContainerWin::ContentsZoomChange(bool zoom_in) {
 }
 
 gfx::NativeWindow ExternalTabContainerWin::GetFrameNativeWindow() {
-  return hwnd();
+  return GetNativeView();
 }
 
 bool ExternalTabContainerWin::TakeFocus(content::WebContents* source,
                                         bool reverse) {
   if (automation_) {
     automation_->Send(new AutomationMsg_TabbedOut(tab_handle_,
         base::win::IsShiftPressed()));
   }
 
   return true;
@@ skipping 331 matching lines @@
       break;
     }
     default:
       NOTREACHED();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ExternalTabContainer, views::NativeWidgetWin overrides:
 
-LRESULT ExternalTabContainerWin::OnCreate(LPCREATESTRUCT create_struct) {
-  LRESULT result = views::NativeWidgetWin::OnCreate(create_struct);
-  if (result == 0) {
-    // Grab a reference here which will be released in OnFinalMessage
-    AddRef();
-  }
-  return result;
+void ExternalTabContainerWin::HandleCreate() {
+  views::NativeWidgetWin::HandleCreate();
+  // Grab a reference here which will be released in OnFinalMessage
+  AddRef();
 }
 
-void ExternalTabContainerWin::OnDestroy() {
+void ExternalTabContainerWin::HandleDestroying() {
   prop_.reset();
   Uninitialize();
-  NativeWidgetWin::OnDestroy();
+  NativeWidgetWin::HandleDestroying();
 }
 
 void ExternalTabContainerWin::OnFinalMessage(HWND window) {
   GetWidget()->OnNativeWidgetDestroyed();
   // Release the reference which we grabbed in WM_CREATE.
   Release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ExternalTabContainer, private:
@@ skipping 286 matching lines @@
   if (params.disposition == CURRENT_TAB) {
     DCHECK(route_all_top_level_navigations_);
     forward_params.disposition = NEW_FOREGROUND_TAB;
   }
   WebContents* new_contents =
       ExternalTabContainerWin::OpenURLFromTab(source, forward_params);
   // support only one navigation for a dummy tab before it is killed.
   ::DestroyWindow(GetNativeView());
   return new_contents;
 }