Move IN_OVERFLOW from Panel::ExpansionState to new enum.

chrome/browser/ui/panels/panel_browser_view.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_browser_view.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_bounds_animation.h"
@@ skipping 310 matching lines @@
   Paste();
 }
 
 void PanelBrowserView::DrawAttention() {
   // Don't draw attention for active panel.
   if (is_drawing_attention_ || focused_)
     return;
   is_drawing_attention_ = true;
 
   // Bring up the titlebar to get people's attention.
-  if (panel_->expansion_state() == Panel::MINIMIZED)
+  if (panel_->layout_state() == Panel::DOCKED &&
+      panel_->expansion_state() == Panel::MINIMIZED)
     panel_->SetExpansionState(Panel::TITLE_ONLY);
 
   GetFrameView()->SchedulePaint();
 }
 
 bool PanelBrowserView::IsDrawingAttention() const {
   return is_drawing_attention_;
 }
 
 void PanelBrowserView::StopDrawingAttention() {
@@ skipping 136 matching lines @@
   }
 
   // If the panel drag was cancelled before the mouse is released, do not treat
   // this as a click.
   if (mouse_dragging_state_ != NO_DRAGGING)
     return true;
 
   // Do not minimize the panel when we just clear the attention state. This is
   // a hack to prevent the panel from being minimized when the user clicks on
   // the title-bar to clear the attention.
-  if (panel_->expansion_state() == Panel::EXPANDED &&
+  if (panel_->layout_state() == Panel::DOCKED &&
+      panel_->expansion_state() == Panel::EXPANDED &&
       base::TimeTicks::Now() - attention_cleared_time_ <
       base::TimeDelta::FromMilliseconds(kSuspendMinimizeOnClickIntervalMs)) {
     return true;
   }
 
   // Ignore long clicks. Treated as a canceled click to be consistent with Mac.
   if (base::TimeTicks::Now() - mouse_pressed_time_ >
       base::TimeDelta::FromMilliseconds(kShortClickThresholdMs))
     return true;
 
-  Panel::ExpansionState new_expansion_state =
-    (panel_->expansion_state() != Panel::EXPANDED) ? Panel::EXPANDED
-                                                   : Panel::MINIMIZED;
-  panel_->SetExpansionState(new_expansion_state);
+  if (panel_->layout_state() == Panel::IN_OVERFLOW) {
+    panel_->SetLayoutState(Panel::DOCKED);
+    panel_->SetExpansionState(Panel::EXPANDED);
+  } else {
+    Panel::ExpansionState new_expansion_state =
+        (panel_->expansion_state() != Panel::EXPANDED) ? Panel::EXPANDED
+                                                       : Panel::MINIMIZED;
+    panel_->SetExpansionState(new_expansion_state);
+  }
+
   return true;
 }
 
 bool PanelBrowserView::OnTitlebarMouseCaptureLost() {
   if (mouse_dragging_state_ == DRAGGING_STARTED)
     return EndDragging(true);
   return true;
 }
 
 bool PanelBrowserView::EndDragging(bool cancelled) {
@@ skipping 105 matching lines @@
 }
 
 bool NativePanelTestingWin::IsWindowSizeKnown() const {
   return true;
 }
 
 bool NativePanelTestingWin::IsAnimatingBounds() const {
   return panel_browser_view_->bounds_animator_.get() &&
          panel_browser_view_->bounds_animator_->is_animating();
 }