Add PanelOverflowStrip to handle panel overflow.

chrome/browser/ui/panels/panel.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.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"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
+#include "chrome/browser/ui/panels/panel_overflow_strip.h"
+#include "chrome/browser/ui/panels/panel_strip.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/window_sizer.h"
 #include "chrome/browser/web_applications/web_app.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "ui/gfx/rect.h"
@@ skipping 89 matching lines @@
   DCHECK(min_size.height() <= max_size.height());
   min_size_ = min_size;
   max_size_ = max_size;
 
   ConfigureAutoResize(browser()->GetSelectedTabContents());
 }
 
 void Panel::SetExpansionState(ExpansionState new_state) {
   if (expansion_state_ == new_state)
     return;
-
   ExpansionState old_state = expansion_state_;
   expansion_state_ = new_state;
 
-  int height;
-  switch (expansion_state_) {
-    case EXPANDED:
-      height = restored_size_.height();
-      break;
-    case TITLE_ONLY:
-      height = native_panel_->TitleOnlyHeight();
-      break;
-    case MINIMIZED:
-      height = kMinimizedPanelHeight;
-      break;
-    default:
-      NOTREACHED();
-      height = restored_size_.height();
-      break;
-  }
-
-  int bottom = manager()->GetBottomPositionForExpansionState(expansion_state_);
-  gfx::Rect bounds = native_panel_->GetPanelBounds();
-  bounds.set_y(bottom - height);
-  bounds.set_height(height);
-  SetPanelBounds(bounds);
-
-  manager()->OnPanelExpansionStateChanged(old_state, new_state);
+  manager()->OnPanelExpansionStateChanged(this, old_state);
 
   // 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());
 }
@@ skipping 20 matching lines @@
 
 bool Panel::IsDrawingAttention() const {
   return native_panel_->IsDrawingAttention();
 }
 
 void Panel::FullScreenModeChanged(bool is_full_screen) {
   native_panel_->FullScreenModeChanged(is_full_screen);
 }
 
 void Panel::Show() {
-  native_panel_->ShowPanel();
+  // Don't show panel as active if it is in overflow state.
+  if (expansion_state_ == IN_OVERFLOW)
+    ShowInactive();
+  else
+    native_panel_->ShowPanel();
 }
 
 void Panel::ShowInactive() {
   native_panel_->ShowPanelInactive();
 }
 
 void Panel::SetBounds(const gfx::Rect& bounds) {
   // Ignore any SetBounds requests since the bounds are completely controlled
   // by panel manager.
 }
 
 // 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::MoveOutOfOverflow() {
+  if (expansion_state_ != Panel::IN_OVERFLOW)
+    return;
+  manager()->panel_overflow_strip()->Remove(this);
+  manager()->panel_strip()->AddPanel(this);
+}
+
 void Panel::Activate() {
+  MoveOutOfOverflow();
+
   // Make sure the panel is expanded when activated programmatically,
   // so the user input does not go into collapsed window.
   SetExpansionState(Panel::EXPANDED);
   native_panel_->ActivatePanel();
 }
 
 void Panel::Deactivate() {
   native_panel_->DeactivatePanel();
 }
 
@@ skipping 50 matching lines @@
   bounds.set_y(bounds.bottom() - restored_size_.height());
   bounds.set_x(bounds.right() - restored_size_.width());
   bounds.set_size(restored_size_);
   return bounds;
 }
 
 gfx::Rect Panel::GetBounds() const {
   return native_panel_->GetPanelBounds();
 }
 
+int Panel::TitleOnlyHeight() const {
+  return native_panel_->TitleOnlyHeight();
+}
+
+gfx::Size Panel::IconOnlySize() const {
+  return native_panel_->IconOnlySize();
+}
+
+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 {
   return expansion_state_ != EXPANDED;
 }
 
 void Panel::Maximize() {
@@ skipping 338 matching lines @@
       native_panel_->ContentSizeFromWindowSize(max_size_));
 }
 
 void Panel::OnWindowSizeAvailable() {
   ConfigureAutoResize(browser()->GetSelectedTabContents());
 }
 
 void Panel::DestroyBrowser() {
   native_panel_->DestroyPanelBrowser();
 }