Refactoring balloon collection and added chromeos's BalloonCollection.

 * Separated BalloonCollection and BalloonCollectionImpl
 * Moved BalloonSpaceChangeListener to BalloonCollection from BalloonCollectionImpl as this listener is used by NotificationUIManager.
 * Added BalloonCollectionImpl for chromeos. (chromeos/notifications/balloon_collectino_impl.{h,cc})
 * Changed NotificationPanel to use ScrollView to show all notifications in the panel.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/660111

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40460 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 20 insertions, 119 deletions

diff --git a/chrome/browser/notifications/balloon_collection.h b/chrome/browser/notifications/balloon_collection.h
index 8bc3132..ff37a12 100644
--- a/chrome/browser/notifications/balloon_collection.h
+++ b/chrome/browser/notifications/balloon_collection.h
@@ -7,19 +7,31 @@
 #ifndef CHROME_BROWSER_NOTIFICATIONS_BALLOON_COLLECTION_H_
 #define CHROME_BROWSER_NOTIFICATIONS_BALLOON_COLLECTION_H_
 
-#include <deque>
-
-#include "base/gfx/point.h"
-#include "base/gfx/rect.h"
-#include "base/gfx/size.h"
-#include "chrome/browser/notifications/balloon.h"
-#include "chrome/browser/notifications/notification.h"
-
 class Balloon;
+class Notification;
 class Profile;
 
+namespace gfx {
+class Size;
+}  // namespace gfx
+
 class BalloonCollection {
  public:
+  class BalloonSpaceChangeListener {
+   public:
+    virtual ~BalloonSpaceChangeListener() {}
+
+    // Called when there is more or less space for balloons due to
+    // monitor size changes or balloons disappearing.
+    virtual void OnBalloonSpaceChanged() = 0;
+  };
+
+  static BalloonCollection* Create();
+
+  BalloonCollection()
+      : space_change_listener_(NULL) {
+  }
+
   virtual ~BalloonCollection() {}
 
   // Adds a new balloon for the specified notification.
@@ -38,25 +50,6 @@ class BalloonCollection {
 
   // Inform the collection that a balloon was closed.
   virtual void OnBalloonClosed(Balloon* source) = 0;
-};
-
-// A balloon collection represents a set of notification balloons being
-// shown on the screen.  It positions new notifications according to
-// a layout, and monitors for balloons being closed, which it reports
-// up to its parent, the notification UI manager.
-class BalloonCollectionImpl : public BalloonCollection {
- public:
-  class BalloonSpaceChangeListener {
-   public:
-    virtual ~BalloonSpaceChangeListener() {}
-
-    // Called when there is more or less space for balloons due to
-    // monitor size changes or balloons disappearing.
-    virtual void OnBalloonSpaceChanged() = 0;
-  };
-
-  BalloonCollectionImpl();
-  virtual ~BalloonCollectionImpl();
 
   BalloonSpaceChangeListener* space_change_listener() {
     return space_change_listener_;
@@ -65,101 +58,9 @@ class BalloonCollectionImpl : public BalloonCollection {
     space_change_listener_ = listener;
   }
 
-  // BalloonCollectionInterface overrides
-  virtual void Add(const Notification& notification,
-                   Profile* profile);
-  virtual bool Remove(const Notification& notification);
-  virtual bool HasSpace() const;
-  virtual void ResizeBalloon(Balloon* balloon, const gfx::Size& size);
-  virtual void OnBalloonClosed(Balloon* source);
-
  protected:
-  // Calculates layout values for the balloons including
-  // the scaling, the max/min sizes, and the upper left corner of each.
-  class Layout {
-   public:
-    Layout();
-
-    // Refresh the work area and balloon placement.
-    void OnDisplaySettingsChanged();
-
-    // TODO(johnnyg): Scale the size to account for the system font factor.
-    static int min_balloon_width() { return kBalloonMinWidth; }
-    static int max_balloon_width() { return kBalloonMaxWidth; }
-    static int min_balloon_height() { return kBalloonMinHeight; }
-    static int max_balloon_height() { return kBalloonMaxHeight; }
-
-    // Returns both the total space available and the maximum
-    // allowed per balloon.
-    //
-    // The size may be a height or length depending on the way that
-    // balloons are laid out.
-    void GetMaxLinearSize(int* max_balloon_size, int* total_size) const;
-
-    // Refresh the cached values for work area and drawing metrics.
-    // The application should call this method to re-acquire metrics after
-    // any resolution or settings change.
-    // Returns true if and only if a metric changed.
-    bool RefreshSystemMetrics();
-
-    // Returns the origin for the sequence of balloons depending on layout.
-    // Should not be used to place a balloon -- only to call NextPosition().
-    gfx::Point GetLayoutOrigin() const;
-
-    // Compute the position for the next balloon.
-    // Start with *position_iterator = GetLayoutOrigin() and call repeatedly
-    // to get a sequence of positions. Return value is the upper-left coordinate
-    // for each next balloon.
-    gfx::Point NextPosition(const gfx::Size& balloon_size,
-                            gfx::Point* position_iterator) const;
-
-   private:
-    enum Placement {
-      HORIZONTALLY_FROM_BOTTOM_LEFT,
-      HORIZONTALLY_FROM_BOTTOM_RIGHT,
-      VERTICALLY_FROM_TOP_RIGHT,
-      VERTICALLY_FROM_BOTTOM_RIGHT
-    };
-
-    // Layout parameters
-    int VerticalEdgeMargin() const;
-    int HorizontalEdgeMargin() const;
-    int InterBalloonMargin() const;
-
-    // Minimum and maximum size of balloon content.
-    static const int kBalloonMinWidth = 300;
-    static const int kBalloonMaxWidth = 300;
-    static const int kBalloonMinHeight = 24;
-    static const int kBalloonMaxHeight = 120;
-
-    static Placement placement_;
-    gfx::Rect work_area_;
-    DISALLOW_COPY_AND_ASSIGN(Layout);
-  };
-
-  // Creates a new balloon. Overridable by unit tests.  The caller is
-  // responsible for freeing the pointer returned.
-  virtual Balloon* MakeBalloon(const Notification& notification,
-                               Profile* profile);
-
- private:
-  // The number of balloons being displayed.
-  int count() const { return balloons_.size(); }
-
-  // Adjusts the positions of the balloons (e.g., when one is closed).
-  void PositionBalloons(bool is_reposition);
-
   // Non-owned pointer to an object listening for space changes.
   BalloonSpaceChangeListener* space_change_listener_;
-
-  // Queue of active balloons.
-  typedef std::deque<Balloon*> Balloons;
-  Balloons balloons_;
-
-  // The layout parameters for balloons in this collection.
-  Layout layout_;
-
-  DISALLOW_COPY_AND_ASSIGN(BalloonCollectionImpl);
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_BALLOON_COLLECTION_H_