Move IN_OVERFLOW from Panel::ExpansionState to new enum.

chrome/browser/ui/panels/panel_browser_frame_view.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_browser_frame_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/themes/theme_service.h"
@@ skipping 476 matching lines @@
   // the minimum size.
   return gfx::Size();
 }
 
 void PanelBrowserFrameView::Layout() {
   // Check if the width is only enough to show only the icon, or both icon
   // and title. Hide corresponding controls accordingly.
   bool show_close_button = true;
   bool show_settings_button = true;
   bool show_title_label = true;
-  if (panel_browser_view_->panel()->expansion_state() == Panel::IN_OVERFLOW) {
+  if (panel_browser_view_->panel()->layout_state() == Panel::IN_OVERFLOW) {
     if (width() <= IconOnlyWidth()) {
       show_close_button = false;
       show_settings_button = false;
       show_title_label = false;
     } else {
       show_settings_button = false;
     }
   }
 
   if (!has_settings_button_)
@@ skipping 350 matching lines @@
 
   UpdateSettingsButtonVisibility(panel_browser_view_->focused(),
                                  mouse_entered);
 }
 
 void PanelBrowserFrameView::UpdateSettingsButtonVisibility(
     bool focused, bool cursor_in_view) {
   DCHECK(has_settings_button_);
 
   // The settings button is not shown in the overflow state.
-  if (panel_browser_view_->panel()->expansion_state() == Panel::IN_OVERFLOW)
+  if (panel_browser_view_->panel()->layout_state() == Panel::IN_OVERFLOW)
     return;
 
   bool is_settings_button_visible = focused || cursor_in_view;
   if (is_settings_button_visible_ == is_settings_button_visible)
     return;
   is_settings_button_visible_ = is_settings_button_visible;
 
   // Even if we're hiding the settings button, we still make it visible for the
   // time period that the animation is running.
   settings_button_->SetVisible(true);
@@ skipping 20 matching lines @@
 
   settings_menu_model_.reset(
       new PanelSettingsMenuModel(panel_browser_view_->panel()));
   settings_menu_adapter_.reset(
       new views::MenuModelAdapter(settings_menu_model_.get()));
   settings_menu_ = new views::MenuItemView(settings_menu_adapter_.get());
   settings_menu_adapter_->BuildMenu(settings_menu_);
   settings_menu_runner_.reset(new views::MenuRunner(settings_menu_));
   return true;
 }