Panel strip refactor cleanup.

chrome/browser/ui/panels/panel_strip.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_PANELS_PANEL_STRIP_H_
 #define CHROME_BROWSER_UI_PANELS_PANEL_STRIP_H_
 #pragma once
 
 #include <vector>
 #include "base/basictypes.h"
@@ skipping 64 matching lines @@
   int GetMaxPanelWidth() const;
   int GetMaxPanelHeight() const;
   int StartingRightPosition() const;
 
   void OnAutoHidingDesktopBarVisibilityChanged(
       AutoHidingDesktopBar::Alignment alignment,
       AutoHidingDesktopBar::Visibility visibility);
 
   void OnFullScreenModeChanged(bool is_full_screen);
 
-#ifdef UNIT_TEST
-  static int horizontal_spacing() { return kPanelsHorizontalSpacing; }
-
-  void remove_delays_for_testing() {
-    remove_delays_for_testing_ = true;
-  }
-
-  int minimized_panel_count() {
-    return minimized_panel_count_;
-  }
-#endif
-
  private:
   enum TitlebarAction {
     NO_ACTION,
     BRING_UP,
     BRING_DOWN
   };
 
   // Overridden from PanelMouseWatcherObserver:
   virtual void OnMouseMove(const gfx::Point& mouse_position) OVERRIDE;
 
@@ skipping 20 matching lines @@
   void DragRight();
 
   // Does the real job of bringing up or down the titlebars.
   void DoBringUpOrDownTitlebars(bool bring_up);
   // The callback for a delyed task, checks if it still need to perform
   // the delayed action.
   void DelayedBringUpOrDownTitlebarsCheck();
 
   int GetRightMostAvailablePosition() const;
 
-  // Moves the panel from the panel strip to the overflow area because
-  // the panel will not fit within the bounds of the panel strip.
-  // Overflow may occur when new panels are added, the bounds of the strip
-  // changes, a panel's size grows, a panel is moved from overflow into
-  // the strip, etc.
-  void MovePanelToOverflow(Panel* panel, bool is_new);
-
-  // Moves panels to the overflow area, starting from the last panel.
-  // |overflow_point| is the index of the first panel to oveflow.
-  void MovePanelsToOverflow(size_t overflow_point);
-
-  // Adds zero or more panels from overflow as will fit in the panel strip.
-  void MovePanelsFromOverflowIfNeeded();
+  // Called by AddPanel() after a delay to move a newly created panel from
+  // the panel strip to the overflow area because the panel could not fit

[jianli, 2011/12/07 22:13:26]

overflow area => overflow strip

+  // within the bounds of the panel strip. New panels are first displayed
+  // in the panel strip, even if it would overflow, then moved to the overflow

[jianli, 2011/12/07 22:13:26]

Can you remove "even if it would overflow" since it seems to be quite confusing
to me? Consider adding "temporarily" after "in the panel strip".

[jennb, 2011/12/07 23:35:40]

Reworded comment.

+  // area so that all created panels are (at least briefly) visible to the user
+  // before entering overflow.
+  void MovePanelToOverflowAfterDelay(Panel* panel);

[jianli, 2011/12/07 22:13:26]

DelayedMovePanelToOverflow?

[jennb, 2011/12/07 23:35:40]

Done.

 
   PanelManager* panel_manager_;  // Weak, owns us.
 
   // All panels in the panel strip must fit within this area.
   gfx::Rect display_area_;
 
   Panels panels_;
 
   // Stores the panels that are pending to remove. We want to delay the removal
   // when we're in the process of the dragging.
@@ skipping 10 matching lines @@
   int dragging_panel_original_x_;
 
   // Bounds of the panel to drag. It is first set to the original bounds when
   // the dragging happens. Then it is updated to the position that will be set
   // to when the dragging ends.
   gfx::Rect dragging_panel_bounds_;
 
   // Delayed transitions support. Sometimes transitions between minimized and
   // title-only states are delayed, for better usability with Taskbars/Docks.
   TitlebarAction delayed_titlebar_action_;
-  bool remove_delays_for_testing_;
+
   // Owned by MessageLoop after posting.
   base::WeakPtrFactory<PanelStrip> titlebar_action_factory_;
 
   static const int kPanelsHorizontalSpacing = 4;
 
   // Absolute minimum width and height for panels, including non-client area.
   // Should only be big enough to accomodate a close button on the reasonably
   // recognisable titlebar.
   static const int kPanelMinWidth;
   static const int kPanelMinHeight;
 
   DISALLOW_COPY_AND_ASSIGN(PanelStrip);
 };
 
 #endif  // CHROME_BROWSER_UI_PANELS_PANEL_STRIP_H_