Reverting 27113.

views/controls/native/native_view_host_win.cc

 // Copyright (c) 2006-2008 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 "views/controls/native/native_view_host_win.h"
 
 #include "app/gfx/canvas.h"
 #include "base/logging.h"
-#include "base/win_util.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 
-const wchar_t* kNativeViewHostWinKey = L"__NATIVE_VIEW_HOST_WIN__";
-
 namespace views {
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHostWin, public:
 
 NativeViewHostWin::NativeViewHostWin(NativeViewHost* host)
     : host_(host),
-      installed_clip_(false),
-      original_wndproc_(NULL) {
+      installed_clip_(false) {
 }
 
 NativeViewHostWin::~NativeViewHostWin() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHostWin, NativeViewHostWrapper implementation:
 
 void NativeViewHostWin::NativeViewAttached() {
   DCHECK(host_->native_view())
       << "Impossible detatched tab case; See crbug.com/6316";
 
   // First hide the new window. We don't want anything to draw (like sub-hwnd
   // borders), when we change the parent below.
   ShowWindow(host_->native_view(), SW_HIDE);
 
   // Need to set the HWND's parent before changing its size to avoid flashing.
   SetParent(host_->native_view(), host_->GetWidget()->GetNativeView());
   host_->Layout();
-
-  // Subclass the appropriate HWND to get focus notifications.
-  HWND focus_hwnd = host_->focus_native_view();
-  DCHECK(focus_hwnd == host_->native_view() ||
-         ::IsChild(host_->native_view(), focus_hwnd));
-  original_wndproc_ =
-      win_util::SetWindowProc(focus_hwnd,
-                              &NativeViewHostWin::NativeViewHostWndProc);
-
-  // We use a property to retrieve the NativeViewHostWin from the window
-  // procedure.
-  ::SetProp(focus_hwnd, kNativeViewHostWinKey, this);
 }
 
 void NativeViewHostWin::NativeViewDetaching() {
   installed_clip_ = false;
-
-  // Restore the original Windows procedure.
-  DCHECK(original_wndproc_);
-  WNDPROC wndproc = win_util::SetWindowProc(host_->focus_native_view(),
-                                            original_wndproc_);
-  DCHECK(wndproc == &NativeViewHostWin::NativeViewHostWndProc);
-
-  // Also remove the property, it's not needed anymore.
-  HANDLE h = ::RemoveProp(host_->focus_native_view(), kNativeViewHostWinKey);
-  DCHECK(h == this);
 }
 
 void NativeViewHostWin::AddedToWidget() {
   if (!IsWindow(host_->native_view()))
     return;
   HWND parent_hwnd = GetParent(host_->native_view());
   HWND widget_hwnd = host_->GetWidget()->GetNativeView();
   if (parent_hwnd != widget_hwnd)
     SetParent(host_->native_view(), widget_hwnd);
   if (host_->IsVisibleInRootView())
@@ skipping 55 matching lines @@
   if (!IsWindowVisible(host_->native_view()))
     return;  // Currently not visible, nothing to do.
 
   // The window is currently visible, but its clipped by another view. Hide
   // it.
   SetWindowPos(host_->native_view(), 0, 0, 0, 0, 0,
                SWP_HIDEWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOZORDER |
                SWP_NOREDRAW | SWP_NOOWNERZORDER);
 }
 
-// static
-LRESULT CALLBACK NativeViewHostWin::NativeViewHostWndProc(HWND window,
-                                                          UINT message,
-                                                          WPARAM w_param,
-                                                          LPARAM l_param) {
-  NativeViewHostWin* native_view_host =
-      static_cast<NativeViewHostWin*>(::GetProp(window, kNativeViewHostWinKey));
-  DCHECK(native_view_host);
-
-  if (message == WM_SETFOCUS)
-    native_view_host->host_->GotNativeFocus();
-  if (message == WM_DESTROY)
-    native_view_host->host_->Detach();
-
-  return CallWindowProc(native_view_host->original_wndproc_,
-                        window, message, w_param, l_param);
+void NativeViewHostWin::SetFocus() {
+  ::SetFocus(host_->native_view());
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHostWrapper, public:
 
 // static
 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
     NativeViewHost* host) {
   return new NativeViewHostWin(host);
 }
 
 }  // namespace views