Cleanup to keep panel from manipulating its panel strip assignment directly.

chrome/browser/ui/panels/panel.cc

 // Copyright (c) 2012 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 50 matching lines @@
 void Panel::Initialize(const gfx::Rect& bounds) {
   DCHECK(!initialized_);
   DCHECK(!bounds.IsEmpty());
   initialized_ = true;
   native_panel_ = CreateNativePanel(browser_, this, bounds);
 }
 
 void Panel::OnNativePanelClosed() {
   if (auto_resizable_)
     native_panel_->GetPanelBrowser()->tabstrip_model()->RemoveObserver(this);
-  panel_strip_->RemovePanel(this);
   manager()->OnPanelClosed(this);
 }
 
 PanelManager* Panel::manager() const {
   return PanelManager::GetInstance();
 }
 
 bool Panel::draggable() const {
-  return panel_strip()->CanDragPanel(this);
+  return panel_strip_->CanDragPanel(this);
 }
 
 const Extension* Panel::GetExtension() const {
   return GetExtensionFromBrowser(browser());
 }
 
 // TODO(jennb): do not update restored_size here as there's no knowledge
 // at this point whether the bounds change is due to the content window
 // being resized vs a change in current display bounds, e.g. from overflow
 // size change. Change this when refactoring panel resize logic.
@@ skipping 51 matching lines @@
   ConfigureAutoResize(browser()->GetSelectedWebContents());
 }
 
 void Panel::SetAppIconVisibility(bool visible) {
   if (app_icon_visible_ == visible)
     return;
   app_icon_visible_ = visible;
   native_panel_->SetPanelAppIconVisibility(visible);
 }
 
-void Panel::MoveToStrip(PanelStrip* new_strip) {
-  DCHECK_NE(panel_strip_, new_strip);
-  if (panel_strip_)
-    panel_strip_->RemovePanel(this);
-
+void Panel::SetPanelStrip(PanelStrip* new_strip) {

[Andrei, 2012/03/01 00:08:50]

Yes!!!

   panel_strip_ = new_strip;
-  panel_strip_->AddPanel(this);
-
-  content::NotificationService::current()->Notify(
-      chrome::NOTIFICATION_PANEL_CHANGED_LAYOUT_MODE,
-      content::Source<Panel>(this),
-      content::NotificationService::NoDetails());
 }
 
 void Panel::SetExpansionState(ExpansionState new_state) {
   if (expansion_state_ == new_state)
     return;
   old_expansion_state_ = expansion_state_;
   expansion_state_ = new_state;
 
   manager()->OnPanelExpansionStateChanged(this);
 
@@ skipping 511 matching lines @@
       native_panel_->ContentSizeFromWindowSize(max_size_));
 }
 
 void Panel::OnWindowSizeAvailable() {
   ConfigureAutoResize(browser()->GetSelectedWebContents());
 }
 
 void Panel::DestroyBrowser() {
   native_panel_->DestroyPanelBrowser();
 }