Fix a crash in chrome.exe caused by the external tab container instance getti...

chrome/browser/external_tab_container.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 "chrome/browser/external_tab_container.h"
 
 #include "base/logging.h"
 #include "base/win_util.h"
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/profile.h"
@@ skipping 17 matching lines @@
     : automation_(automation),
       root_view_(this),
       tab_contents_(NULL),
       external_accel_table_(NULL),
       external_accel_entry_count_(0),
       tab_contents_container_(NULL),
       ignore_next_load_notification_(false) {
 }
 
 ExternalTabContainer::~ExternalTabContainer() {
+  Uninitialize(m_hWnd);
 }
 
 bool ExternalTabContainer::Init(Profile* profile, HWND parent,
                                 const gfx::Rect& dimensions,
                                 unsigned int style) {
   if (IsWindow()) {
     NOTREACHED();
     return false;
   }
 
@@ skipping 65 matching lines @@
   // 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.
   ModifyStyle(WS_POPUP, style, 0);
 
   // Now apply the parenting and style
   if (parent)
     SetParent(parent);
 
   ::ShowWindow(tab_contents_->GetNativeView(), SW_SHOWNA);
-
   return true;
 }
 
-void ExternalTabContainer::OnDestroy() {
-  views::FocusManager* focus_manager =
-      views::FocusManager::GetFocusManager(GetHWND());
-  if (focus_manager) {
-    focus_manager->RemoveKeystrokeListener(this);
+bool ExternalTabContainer::Uninitialize(HWND window) {
+  if (::IsWindow(window)) {
+    views::FocusManager* focus_manager =
+        views::FocusManager::GetFocusManager(window);
+    if (focus_manager) {
+      focus_manager->RemoveKeystrokeListener(this);
+    }
   }
+
   root_view_.RemoveAllChildViews(true);
   if (tab_contents_) {
     NavigationController* controller = tab_contents_->controller();
     DCHECK(controller);
 
     NotificationService::current()->Notify(
         NotificationType::EXTERNAL_TAB_CLOSED,
         Source<NavigationController>(controller),
         Details<ExternalTabContainer>(this));
+
     tab_contents_->set_delegate(NULL);
     tab_contents_->CloseContents();
     // WARNING: tab_contents_ has likely been deleted.
     tab_contents_ = NULL;
   }
+
+  return true;
 }
 
 void ExternalTabContainer::OnFinalMessage(HWND window) {
+  Uninitialize(window);
   delete this;
 }
 
 LRESULT ExternalTabContainer::OnSize(UINT, WPARAM, LPARAM, BOOL& handled) {
   if (tab_contents_) {
     RECT client_rect = {0};
     GetClientRect(&client_rect);
     ::SetWindowPos(tab_contents_->GetNativeView(), NULL, client_rect.left,
                    client_rect.top, client_rect.right - client_rect.left,
                    client_rect.bottom - client_rect.top, SWP_NOZORDER);
@@ skipping 246 matching lines @@
   if (!::IsWindow(parent_window)) {
     return NULL;
   }
   if (!IsExternalTabContainer(parent_window)) {
     return NULL;
   }
   ExternalTabContainer* container = reinterpret_cast<ExternalTabContainer*>(
       GetProp(parent_window, kWindowObjectKey));
   return container;
 }