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"

[jennb, 2011/12/02 19:15:00]

Don't need this.

[jianli, 2011/12/02 23:23:46]

It is needed now after I added Panel::MoveOutOfOverflow.

+#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 91 matching lines @@
   if (auto_resizable_) {
     RenderViewHost* render_view_host = GetRenderViewHost();
     if (render_view_host)
       RequestRenderViewHostToDisableScrollbars(render_view_host);
   }
 }
 
 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 16 matching lines @@
   gfx::Rect bounds = native_panel_->GetPanelBounds();
   return bounds.x() <= mouse_x && mouse_x <= bounds.right() &&
          mouse_y >= bounds.y();
 }
 
 bool Panel::IsDrawingAttention() const {
   return native_panel_->IsDrawingAttention();
 }
 
 void Panel::Show() {
-  native_panel_->ShowPanel();
+  // Don't show panel as active if it is in overflow state.
+  if (expansion_state_ == IN_OVERFLOW)
+    native_panel_->ShowPanelInactive();

[jennb, 2011/12/02 19:15:00]

nit: call ShowInactive() rather than direct to native_panel_ to keep code safe
in case ShowInactive needs to do more some day.

[jianli, 2011/12/02 23:23:46]

Done.

+  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::Activate() {
+  // Don't activate the panel if it is in overflow state.

[jennb, 2011/12/02 19:15:00]

Activate() is the way an app can force it's window to be focused. Overflow
panels should move out of overflow and activate, which doesn't require a code
change here as SetExpansionState to EXPANDED should move panel out of overflow.

[jianli, 2011/12/02 23:23:46]

Done. Called the newly added method MoveOutOfOverflow.

+  if (expansion_state_ == IN_OVERFLOW)
+    return;
+
   // 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 358 matching lines @@
   if (auto_resizable_) {
     RenderViewHost* render_view_host = GetRenderViewHost();
     if (render_view_host)
       RequestRenderViewHostToDisableScrollbars(render_view_host);
   }
 }
 
 void Panel::DestroyBrowser() {
   native_panel_->DestroyPanelBrowser();
 }