Refactors HWNDView, NativeViewHostGtk and NativeViewHost so that they match t...

views/controls/native_control.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_control.h"
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
 #include <atlframe.h>
 #include <atlmisc.h>
 
 #include "app/l10n_util_win.h"
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "views/background.h"
 #include "views/border.h"
-#include "views/controls/hwnd_view.h"
+#include "views/controls/native/native_view_host.h"
 #include "views/focus/focus_manager.h"
 #include "views/widget/widget.h"
 #include "base/gfx/native_theme.h"
 
 namespace views {
 
 // Maps to the original WNDPROC for the controller window before we subclassed
 // it.
 static const wchar_t* const kHandlerKey =
     L"__CONTROL_ORIGINAL_MESSAGE_HANDLER__";
@@ skipping 146 matching lines @@
 
 NativeControl::~NativeControl() {
   if (container_) {
     container_->ResetParent();
     ::DestroyWindow(*container_);
   }
 }
 
 void NativeControl::ValidateNativeControl() {
   if (hwnd_view_ == NULL) {
-    hwnd_view_ = new HWNDView();
+    hwnd_view_ = new NativeViewHost;
     AddChildView(hwnd_view_);
   }
 
   if (!container_ && IsVisible()) {
     container_ = new NativeControlContainer(this);
     hwnd_view_->Attach(*container_);
     if (!enabled_)
       EnableWindow(GetNativeControlHWND(), enabled_);
 
     // This message ensures that the focus border is shown.
     ::SendMessage(container_->GetControl(),
                   WM_CHANGEUISTATE,
                   MAKELPARAM(UIS_CLEAR, UISF_HIDEFOCUS),
                   0);
   }
 }
 
 void NativeControl::ViewHierarchyChanged(bool is_add, View *parent,
                                          View *child) {
-  if (is_add && GetWidget()) {
+  if (is_add && child == this && GetWidget()) {
     ValidateNativeControl();
     Layout();
   }
 }
 
 void NativeControl::Layout() {
   if (!container_ && GetWidget())
     ValidateNativeControl();
 
   if (hwnd_view_) {
@@ skipping 156 matching lines @@
                             reinterpret_cast<WNDPROC>(original_handler));
     RemoveProp(window, kHandlerKey);
     RemoveProp(window, kNativeControlKey);
   }
 
   return CallWindowProc(reinterpret_cast<WNDPROC>(original_handler), window,
                         message, w_param, l_param);
 }
 
 }  // namespace views