Index: chrome/browser/ui/panels/panel_manager.h |
diff --git a/chrome/browser/ui/panels/panel_manager.h b/chrome/browser/ui/panels/panel_manager.h |
index e7319b3c02008affcb1317627345e6305acb8ca3..b72bd54501e8c3ddcdf861b506fd1b374ff8816e 100644 |
--- a/chrome/browser/ui/panels/panel_manager.h |
+++ b/chrome/browser/ui/panels/panel_manager.h |
@@ -23,6 +23,7 @@ |
class Browser; |
class PanelMouseWatcher; |
+class PanelOverflowStrip; |
class PanelStrip; |
// This class manages a set of panels. |
@@ -52,8 +53,8 @@ class PanelManager : public AutoHidingDesktopBar::Observer { |
void EndDragging(bool cancelled); |
// Invoked when a panel's expansion state changes. |
- void OnPanelExpansionStateChanged(Panel::ExpansionState old_state, |
- Panel::ExpansionState new_state); |
+ void OnPanelExpansionStateChanged(Panel* panel, |
+ Panel::ExpansionState old_state); |
// Invoked when the preferred window size of the given panel might need to |
// get changed. |
@@ -67,12 +68,6 @@ class PanelManager : public AutoHidingDesktopBar::Observer { |
// Brings up or down the titlebars for all minimized panels. |
void BringUpOrDownTitlebars(bool bring_up); |
- // Returns the bottom position for the panel per its expansion state. If auto- |
- // hide bottom bar is present, we want to move the minimized panel to the |
- // bottom of the screen, not the bottom of the work area. |
- int GetBottomPositionForExpansionState( |
- Panel::ExpansionState expansion_state) const; |
- |
// Returns the next browser window which could be either panel window or |
// tabbed window, to switch to if the given panel is going to be deactivated. |
// Returns NULL if such window cannot be found. |
@@ -83,11 +78,6 @@ class PanelManager : public AutoHidingDesktopBar::Observer { |
int StartingRightPosition() const; |
const Panels& panels() const; |
- // Moves a panel to the overflow strip. The panel does not currently |
- // belong in any other strip. |
- // |is_new| is true if the panel was just created. |
- void MoveToOverflowStrip(Panel* panel, bool is_new); |
- |
AutoHidingDesktopBar* auto_hiding_desktop_bar() const { |
return auto_hiding_desktop_bar_; |
} |
@@ -100,6 +90,10 @@ class PanelManager : public AutoHidingDesktopBar::Observer { |
return panel_strip_.get(); |
} |
+ PanelOverflowStrip* panel_overflow_strip() const { |
+ return panel_overflow_strip_.get(); |
+ } |
+ |
#ifdef UNIT_TEST |
static int horizontal_spacing() { return PanelStrip::horizontal_spacing(); } |
@@ -156,6 +150,7 @@ class PanelManager : public AutoHidingDesktopBar::Observer { |
void Layout(); |
scoped_ptr<PanelStrip> panel_strip_; |
+ scoped_ptr<PanelOverflowStrip> panel_overflow_strip_; |
// Use a mouse watcher to know when to bring up titlebars to "peek" at |
// minimized panels. Mouse movement is only tracked when there is a minimized |