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);
+  DCHECK(!panel_strip_);
 }
 
 PanelManager* Panel::manager() const {
   return PanelManager::GetInstance();
 }
 
 bool Panel::draggable() const {
-  return panel_strip()->CanDragPanel(this);
+  return panel_strip_ && 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.
 void Panel::SetPanelBounds(const gfx::Rect& bounds) {
-  if (panel_strip_->type() == PanelStrip::DOCKED &&
+  if (panel_strip_ && panel_strip_->type() == PanelStrip::DOCKED &&
       expansion_state_ == Panel::EXPANDED)
     restored_size_ = bounds.size();
 
   native_panel_->SetPanelBounds(bounds);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_CHANGED_BOUNDS,
       content::Source<Panel>(this),
       content::NotificationService::NoDetails());
 }
 
 void Panel::SetPanelBoundsInstantly(const gfx::Rect& bounds) {
-  if (panel_strip_->type() == PanelStrip::DOCKED &&
+  if (panel_strip_ && panel_strip_->type() == PanelStrip::DOCKED &&
       expansion_state_ == Panel::EXPANDED)
     restored_size_ = bounds.size();
 
   native_panel_->SetPanelBoundsInstantly(bounds);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_CHANGED_BOUNDS,
       content::Source<Panel>(this),
       content::NotificationService::NoDetails());
 }
@@ skipping 26 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);
-
-  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);
 
   // The minimized panel should not get the focus.
   if (expansion_state_ == MINIMIZED)
     Deactivate();
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
       content::Source<Panel>(this),
       content::NotificationService::NoDetails());
 }
 
 bool Panel::IsDrawingAttention() const {
   return native_panel_->IsDrawingAttention();
 }
 
 void Panel::FullScreenModeChanged(bool is_full_screen) {
   native_panel_->FullScreenModeChanged(is_full_screen);
 }
 
 void Panel::Show() {
-  if (manager()->is_full_screen())
+  if (manager()->is_full_screen() || !panel_strip_)
     return;
 
   if (panel_strip_->CanShowPanelAsActive(this))
     native_panel_->ShowPanel();
   else
     ShowInactive();
 }
 
 void Panel::ShowInactive() {
-  if (manager()->is_full_screen())
+  if (manager()->is_full_screen() || !panel_strip_)
     return;
 
   native_panel_->ShowPanelInactive();
 }
 
 void Panel::SetBounds(const gfx::Rect& bounds) {
   // Ignore bounds position as the panel manager controls all positioning.
   manager()->ResizePanel(this, bounds.size());
 }
 
 // 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();
 }
 
 void Panel::Activate() {
+  if (!panel_strip_)
+    return;
+
   panel_strip_->ActivatePanel(this);
   native_panel_->ActivatePanel();
 }
 
 void Panel::Deactivate() {
   native_panel_->DeactivatePanel();
 }
 
 bool Panel::IsActive() const {
   return native_panel_->IsPanelActive();
 }
 
 void Panel::FlashFrame(bool flash) {
-  if (IsDrawingAttention() == flash)
+  if (IsDrawingAttention() == flash || !panel_strip_)
     return;
 
   // Don't draw attention for an active panel.
   if (flash && IsActive())
     return;
 
   native_panel_->DrawAttention(flash);
   panel_strip_->OnPanelAttentionStateChanged(this);
 }
 
@@ skipping 64 matching lines @@
 void Panel::EnsureFullyVisible() {
   native_panel_->EnsurePanelFullyVisible();
 }
 
 bool Panel::IsMaximized() const {
   // Size of panels is managed by PanelManager, they are never 'zoomed'.
   return false;
 }
 
 bool Panel::IsMinimized() const {
-  PanelStrip::Type strip_type = panel_strip_->type();
-  return strip_type == PanelStrip::IN_OVERFLOW ||
-      (strip_type == PanelStrip::DOCKED && expansion_state_ != EXPANDED);
+  return !panel_strip_ || panel_strip()->IsPanelMinimized(this);
 }
 
 void Panel::Maximize() {
   Restore();
 }
 
 void Panel::Minimize() {
-  panel_strip_->MinimizePanel(this);
+  if (panel_strip_)
+    panel_strip_->MinimizePanel(this);
 }
 
 void Panel::Restore() {
-  panel_strip_->RestorePanel(this);
+  if (panel_strip_)
+    panel_strip_->RestorePanel(this);
 }
 
 void Panel::EnterFullscreen(
       const GURL& url, FullscreenExitBubbleType type) {
   NOTIMPLEMENTED();
 }
 
 void Panel::ExitFullscreen() {
   NOTIMPLEMENTED();
 }
@@ skipping 341 matching lines @@
       native_panel_->ContentSizeFromWindowSize(max_size_));
 }
 
 void Panel::OnWindowSizeAvailable() {
   ConfigureAutoResize(browser()->GetSelectedWebContents());
 }
 
 void Panel::DestroyBrowser() {
   native_panel_->DestroyPanelBrowser();
 }