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

chrome/browser/ui/panels/detached_panel_strip.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/detached_panel_strip.h"
 
 #include <algorithm>
 #include "base/logging.h"
 #include "chrome/browser/ui/panels/panel_drag_controller.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
@@ skipping 16 matching lines @@
     return;
 
   RefreshLayout();
 }
 
 void DetachedPanelStrip::RefreshLayout() {
   NOTIMPLEMENTED();
 }
 
 void DetachedPanelStrip::AddPanel(Panel* panel) {
-  DCHECK_EQ(this, panel->panel_strip());
+  DCHECK_NE(this, panel->panel_strip());
+  panel->set_panel_strip(this);
   panels_.insert(panel);
 }
 
-bool DetachedPanelStrip::RemovePanel(Panel* panel) {
-  return panels_.erase(panel) != 0;
+void DetachedPanelStrip::RemovePanel(Panel* panel) {
+  DCHECK_EQ(this, panel->panel_strip());
+  panel->set_panel_strip(NULL);
+  panels_.erase(panel);
 }
 
 void DetachedPanelStrip::CloseAll() {
   // Make a copy as closing panels can modify the iterator.
   Panels panels_copy = panels_;
 
   for (Panels::const_iterator iter = panels_copy.begin();
        iter != panels_copy.end(); ++iter)
     (*iter)->Close();
 }
@@ skipping 16 matching lines @@
 void DetachedPanelStrip::MinimizePanel(Panel* panel) {
   DCHECK_EQ(this, panel->panel_strip());
   NOTIMPLEMENTED();
 }
 
 void DetachedPanelStrip::RestorePanel(Panel* panel) {
   DCHECK_EQ(this, panel->panel_strip());
   NOTIMPLEMENTED();
 }
 
+bool DetachedPanelStrip::IsPanelMinimized(const Panel* panel) const {
+  DCHECK_EQ(this, panel->panel_strip());
+  NOTIMPLEMENTED();
+  return false;
+}
+
 bool DetachedPanelStrip::CanShowPanelAsActive(const Panel* panel) const {
   // All detached panels can be shown as active.
   return true;
 }
 
 bool DetachedPanelStrip::CanDragPanel(const Panel* panel) const {
   // All detached panels are draggable.
   return true;
 }
 
@@ skipping 11 matching lines @@
     gfx::Rect new_bounds(panel->GetBounds());
     new_bounds.set_origin(
         panel_manager_->drag_controller()->dragging_panel_original_position());
     panel->SetPanelBounds(new_bounds);
   }
 }
 
 bool DetachedPanelStrip::HasPanel(Panel* panel) const {
   return panels_.find(panel) != panels_.end();
 }