Re-land r51526

views/controls/native_control.cc

 // Copyright (c) 2010 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>
@@ skipping 183 matching lines @@
     // 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 && child == this && GetWidget()) {
+  if (is_add && parent != this && !container_ && GetWidget()) {
     ValidateNativeControl();
     Layout();
   }
 }
 
 void NativeControl::Layout() {
   if (!container_ && GetWidget())
     ValidateNativeControl();
 
   if (hwnd_view_) {
@@ skipping 158 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