Add PanelOverflowStrip to handle panel overflow.

chrome/browser/ui/panels/panel_manager.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_manager.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/panels/panel_mouse_watcher.h"
+#include "chrome/browser/ui/panels/panel_overflow_strip.h"
 #include "chrome/browser/ui/panels/panel_strip.h"
 #include "chrome/browser/ui/window_sizer.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 
 namespace {
 const int kOverflowStripThickness = 24;
 
 // Width of spacing around panel strip and the left/right edges of the screen.
 const int kPanelStripLeftMargin = kOverflowStripThickness + 6;
 const int kPanelStripRightMargin = 24;
 
 // Height of panel strip is based on the factor of the working area.
 const double kPanelStripHeightFactor = 0.5;
 
 }  // namespace
 
 // static
 PanelManager* PanelManager::GetInstance() {
   static base::LazyInstance<PanelManager> instance = LAZY_INSTANCE_INITIALIZER;
   return instance.Pointer();
 }
 
 PanelManager::PanelManager()
     : panel_mouse_watcher_(PanelMouseWatcher::Create()),
       auto_sizing_enabled_(true) {
   panel_strip_.reset(new PanelStrip(this));
+  panel_overflow_strip_.reset(new PanelOverflowStrip(this));
   auto_hiding_desktop_bar_ = AutoHidingDesktopBar::Create(this);
   OnDisplayChanged();
 }
 
 PanelManager::~PanelManager() {
 }
 
 void PanelManager::OnDisplayChanged() {
   scoped_ptr<WindowSizer::MonitorInfoProvider> info_provider(
       WindowSizer::CreateDefaultMonitorInfoProvider());
@@ skipping 20 matching lines @@
 void PanelManager::Layout() {
   int height =
       static_cast<int>(adjusted_work_area_.height() * kPanelStripHeightFactor);
   gfx::Rect panel_strip_bounds;
   panel_strip_bounds.set_x(adjusted_work_area_.x() + kPanelStripLeftMargin);
   panel_strip_bounds.set_y(adjusted_work_area_.bottom() - height);
   panel_strip_bounds.set_width(adjusted_work_area_.width() -
                                kPanelStripLeftMargin - kPanelStripRightMargin);
   panel_strip_bounds.set_height(height);
   panel_strip_->SetDisplayArea(panel_strip_bounds);
+
+  gfx::Rect overflow_area(adjusted_work_area_);

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

Does overflow strip allow for any margins at the top and/or bottom of the work
area?  I can't find the UI mocks that show the +N in overflow to check.

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

No per the mocks.

+  overflow_area.set_width(kOverflowStripThickness);
+  panel_overflow_strip_->SetDisplayArea(overflow_area);
 }
 
 Panel* PanelManager::CreatePanel(Browser* browser) {
   int width = browser->override_bounds().width();
   int height = browser->override_bounds().height();
   Panel* panel = new Panel(browser, gfx::Size(width, height));
   panel_strip_->AddPanel(panel);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_ADDED,
       content::Source<Panel>(panel),
       content::NotificationService::NoDetails());
 
   return panel;
 }
 
 int PanelManager::StartingRightPosition() const {
   return panel_strip_->StartingRightPosition();
 }
 
 void PanelManager::Remove(Panel* panel) {
   if (panel_strip_->Remove(panel))
     return;
-  // TODO(jianli): else try removing from overflow strip
+  panel_overflow_strip_->Remove(panel);

[jennb, 2011/12/02 21:16:58]

nit: DCHECK this returns true?

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

Done.

 }
 
 void PanelManager::OnPanelRemoved(Panel* panel) {
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PANEL_REMOVED,
       content::Source<Panel>(panel),
       content::NotificationService::NoDetails());
 }
 
 void PanelManager::StartDragging(Panel* panel) {
   panel_strip_->StartDragging(panel);
 }
 
 void PanelManager::Drag(int delta_x) {
   panel_strip_->Drag(delta_x);
 }
 
 void PanelManager::EndDragging(bool cancelled) {
   panel_strip_->EndDragging(cancelled);
 }
 
 void PanelManager::OnPanelExpansionStateChanged(
-    Panel::ExpansionState old_state, Panel::ExpansionState new_state) {
-  panel_strip_->OnPanelExpansionStateChanged(old_state, new_state);
+    Panel* panel, Panel::ExpansionState old_state) {
+  if (panel->expansion_state() == Panel::IN_OVERFLOW)
+    panel_overflow_strip_->OnPanelExpansionStateChanged(panel, old_state);
+  else
+    panel_strip_->OnPanelExpansionStateChanged(panel, old_state);
 }
 
 void PanelManager::OnPreferredWindowSizeChanged(
     Panel* panel, const gfx::Size& preferred_window_size) {
   if (!auto_sizing_enabled_)
     return;
   panel_strip_->OnPreferredWindowSizeChanged(panel, preferred_window_size);
 }
 
 bool PanelManager::ShouldBringUpTitlebars(int mouse_x, int mouse_y) const {
@@ skipping 14 matching lines @@
     adjusted_work_area_.set_x(adjusted_work_area_.x() + space);
     adjusted_work_area_.set_width(adjusted_work_area_.width() - space);
   }
   if (auto_hiding_desktop_bar_->IsEnabled(AutoHidingDesktopBar::ALIGN_RIGHT)) {
     int space = auto_hiding_desktop_bar_->GetThickness(
         AutoHidingDesktopBar::ALIGN_RIGHT);
     adjusted_work_area_.set_width(adjusted_work_area_.width() - space);
   }
 }
 
-int PanelManager::GetBottomPositionForExpansionState(
-    Panel::ExpansionState expansion_state) const {
-  return panel_strip_->GetBottomPositionForExpansionState(expansion_state);
-}
-
 BrowserWindow* PanelManager::GetNextBrowserWindowToActivate(
     Panel* panel) const {
   // Find the last active browser window that is not minimized.
   BrowserList::const_reverse_iterator iter = BrowserList::begin_last_active();
   BrowserList::const_reverse_iterator end = BrowserList::end_last_active();
   for (; (iter != end); ++iter) {
     Browser* browser = *iter;
     if (panel->browser() != browser && !browser->window()->IsMinimized())
       return browser->window();
   }
 
   return NULL;
 }
 
-void PanelManager::MoveToOverflowStrip(Panel* panel, bool is_new) {
-  // TODO(jianli) - implement.
-}
-
 void PanelManager::OnAutoHidingDesktopBarThicknessChanged() {
   AdjustWorkAreaForAutoHidingDesktopBars();
   Layout();
 }
 
 void PanelManager::OnAutoHidingDesktopBarVisibilityChanged(
     AutoHidingDesktopBar::Alignment alignment,
     AutoHidingDesktopBar::Visibility visibility) {
   panel_strip_->OnAutoHidingDesktopBarVisibilityChanged(alignment, visibility);
 }
 
 void PanelManager::RemoveAll() {
   panel_strip_->RemoveAll();
-  // TODO(jianli): overflow_strip_->RemoveAll();
+  panel_overflow_strip_->RemoveAll();
 }
 
 int PanelManager::num_panels() const {
-  return panel_strip_->num_panels();
-  // TODO(jianli): + overflow_strip_->num_panels();
+  return panel_strip_->num_panels()+ panel_overflow_strip_->num_panels();

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

space before +

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

Done.

 }
 
 bool PanelManager::is_dragging_panel() const {
   return panel_strip_->is_dragging_panel();
 }
 
 const PanelManager::Panels& PanelManager::panels() const {
   return panel_strip_->panels();
 }