Fix panels being removed from PanelManager prematurely.

chrome/browser/ui/panels/panel.cc

 // Copyright (c) 2011 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/panels/panel.h"
 
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 29 matching lines @@
       restored_height_(bounds.height()) {
   native_panel_ = CreateNativePanel(browser, this, bounds);
 
   registrar_.Add(this,
                  content::NOTIFICATION_TAB_ADDED,
                  content::Source<TabContentsDelegate>(browser));
 }
 
 Panel::~Panel() {
   // Invoked by native panel so do not access native_panel_ here.
+  content::NotificationService::current()->Notify(
+      chrome::NOTIFICATION_PANEL_DELETED,
+      content::Source<Panel>(this),
+      content::NotificationService::NoDetails());
 }
 
 PanelManager* Panel::manager() const {
   return PanelManager::GetInstance();
 }
 
 
 const Extension* Panel::GetExtension() const {
   return GetExtensionFromBrowser(browser());
 }
@@ skipping 106 matching lines @@
 
 void Panel::SetBounds(const gfx::Rect& bounds) {
   // Ignore any SetBounds requests since the bounds are completely controlled
   // by panel manager.
 }
 
 // Close() may be called multiple times if the browser window is not ready to
 // close on the first attempt.
 void Panel::Close() {
   native_panel_->ClosePanel();
-
-// TODO(dimich): Only implemented fully async on Mac. Need to update other
-// platforms. The panel should be removed from PanelManager when and if it
-// was actually closed. The closing can be cancelled because of onbeforeunload
-// handler on the web page. http://crbug.com/102720
-#if !defined(OS_MACOSX)
-  manager()->Remove(this);
-#endif
 }
 
 void Panel::Activate() {
   // Make sure the panel is expanded when activated programmatically,
   // so the user input does not go into collapsed window.
   SetExpansionState(Panel::EXPANDED);
   native_panel_->ActivatePanel();
 }
 
 void Panel::Deactivate() {
@@ skipping 404 matching lines @@
   RequestRenderViewHostToDisableScrollbars(GetRenderViewHost());
 }
 
 Browser* Panel::browser() const {
   return native_panel_->GetPanelBrowser();
 }
 
 void Panel::DestroyBrowser() {
   native_panel_->DestroyPanelBrowser();
 }