Panel strip refactor cleanup.

chrome/browser/ui/panels/panel_overflow_strip.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_overflow_strip.h"
 
 #include "base/logging.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
@@ skipping 23 matching lines @@
 }
 
 void PanelOverflowStrip::SetDisplayArea(const gfx::Rect& display_area) {
   if (display_area_ == display_area)
     return;
 
   display_area_ = display_area;
   Refresh();
 }
 
-void PanelOverflowStrip::AddPanel(Panel* panel, bool is_new) {
+void PanelOverflowStrip::AddPanel(Panel* panel) {
   // TODO(jianli): consider using other container to improve the perf for
   // inserting to the front. http://crbug.com/106222
-  if (is_new)
+  DCHECK_EQ(Panel::IN_OVERFLOW, panel->expansion_state());
+  // Newly created panels that were temporarily in the panel strip
+  // are added to the back of the overflow, whereas panels that are
+  // bumped from the panel strip by other panels go to the front
+  // of overflow.
+  if (panel->has_temporary_layout()) {
+    panel->set_has_temporary_layout(false);
     panels_.push_back(panel);
-  else
+    DoRefresh(panels_.size() - 1, panels_.size() - 1);
+  } else {
     panels_.insert(panels_.begin(), panel);
+    Refresh();
+  }
 
   if (panels_.size() == 1)
     panel_manager_->mouse_watcher()->AddObserver(this);
-
-  panel->SetExpansionState(Panel::IN_OVERFLOW);
-
-  if (is_new) {
-    // When the overflow panel is added to the back, only need to refresh
-    // itself.
-    DoRefresh(panels_.size() - 1, panels_.size() - 1);
-  } else {
-    // When the overflow panel is added to the front, refresh all.
-    Refresh();
-  }
 }
 
 bool PanelOverflowStrip::Remove(Panel* panel) {
   size_t index = 0;
   for (Panels::iterator iter = panels_.begin(); iter != panels_.end();
        ++iter, ++index) {
     if (*iter == panel) {
       panels_.erase(iter);
       DoRefresh(index, panels_.size() - 1);
       panel_manager_->OnPanelRemoved(panel);
@@ skipping 11 matching lines @@
 
   // Start from the bottom to avoid reshuffling.
   for (Panels::reverse_iterator iter = panels_copy.rbegin();
        iter != panels_copy.rend(); ++iter)
     (*iter)->Close();
 }
 
 void PanelOverflowStrip::OnPanelExpansionStateChanged(
     Panel* panel, Panel::ExpansionState old_state) {
   DCHECK(panel->expansion_state() == Panel::IN_OVERFLOW);
+  panel_manager_->panel_strip()->Remove(panel);
+  AddPanel(panel);
+  panel->SetAppIconVisibility(false);
 }
 
 void PanelOverflowStrip::Refresh() {
   if (panels_.empty())
     return;
   DoRefresh(0, panels_.size() - 1);
 }
 
 void PanelOverflowStrip::DoRefresh(size_t start_index, size_t end_index) {
   if (panels_.empty())
@@ skipping 104 matching lines @@
     }
 
     overflow_panel->SetPanelBoundsInstantly(bounds);
   }
 }
 
 void PanelOverflowStrip::OnFullScreenModeChanged(bool is_full_screen) {
   for (size_t i = 0; i < panels_.size(); ++i)
     panels_[i]->FullScreenModeChanged(is_full_screen);
 }