Move IN_OVERFLOW from Panel::ExpansionState to new enum.

chrome/browser/ui/panels/panel_overflow_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/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_overflow_indicator.h"
@@ skipping 63 matching lines @@
 }
 
 void PanelOverflowStrip::UpdateCurrentWidth() {
   current_display_width_ = are_overflow_titles_shown_ ? kOverflowAreaHoverWidth
                                                       : display_area_.width();
 }
 
 void PanelOverflowStrip::AddPanel(Panel* panel) {
   // TODO(jianli): consider using other container to improve the perf for
   // inserting to the front. http://crbug.com/106222
-  DCHECK_EQ(Panel::IN_OVERFLOW, panel->expansion_state());
+  DCHECK_EQ(Panel::IN_OVERFLOW, panel->layout_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);
     DoRefresh(panels_.size() - 1, panels_.size() - 1);
   } else {
     panels_.insert(panels_.begin(), panel);
@@ skipping 44 matching lines @@
 void PanelOverflowStrip::RemoveAll() {
   // Make a copy of the iterator as closing panels can modify the vector.
   Panels panels_copy = panels_;
 
   // 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) {
+void PanelOverflowStrip::OnPanelLayoutStateChanged(
+    Panel* panel, Panel::LayoutState old_state) {
   // Only care about new state being overflow.
-  if (panel->expansion_state() != Panel::IN_OVERFLOW)
+  if (panel->layout_state() != Panel::IN_OVERFLOW)
     return;
 
   panel_manager_->panel_strip()->Remove(panel);
   AddPanel(panel);
   panel->SetAppIconVisibility(false);
   panel->set_draggable(false);
 }
 
 void PanelOverflowStrip::OnPanelAttentionStateChanged(Panel* panel) {
-  DCHECK(panel->expansion_state() == Panel::IN_OVERFLOW);
+  DCHECK_EQ(Panel::IN_OVERFLOW, panel->layout_state());
   UpdateOverflowIndicatorAttention();
 }
 
 void PanelOverflowStrip::Refresh() {
   if (panels_.empty())
     return;
   DoRefresh(0, panels_.size() - 1);
 }
 
 void PanelOverflowStrip::DoRefresh(size_t start_index, size_t end_index) {
@@ skipping 172 matching lines @@
     bounds.set_width(current_display_width);
     overflow_indicator_->SetBounds(bounds);
     overflow_indicator_->SetCount(num_panels() - max_visible_panels);
   }
 }
 
 void PanelOverflowStrip::OnFullScreenModeChanged(bool is_full_screen) {
   for (size_t i = 0; i < panels_.size(); ++i)
     panels_[i]->FullScreenModeChanged(is_full_screen);
 }