Add basic coalescing behavior to the permission bubble manager.

chrome/browser/ui/website_settings/permission_bubble_manager.h

Index: chrome/browser/ui/website_settings/permission_bubble_manager.h
diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager.h b/chrome/browser/ui/website_settings/permission_bubble_manager.h
index ec57e0952f3ad9151479ef7d9db05543e6ec4bcd..119ed393bd4939c2fa4e7a2ff5a9f62b323cfc78 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager.h
+++ b/chrome/browser/ui/website_settings/permission_bubble_manager.h
@@ -7,6 +7,7 @@
 
 #include <vector>
 
+#include "base/timer/timer.h"
 #include "chrome/browser/ui/website_settings/permission_bubble_view.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
@@ -36,13 +37,19 @@ class PermissionBubbleManager
 
   // Add a new request to the permission bubble. Ownership of the request
   // remains with the caller. The caller must arrange for the request to
-  // outlive the PermissionBubbleManager.
+  // outlive the PermissionBubbleManager. If a bubble is visible when this
+  // call is made, the request will be queued up and shown after the current
+  // bubble closes.
   virtual void AddRequest(PermissionBubbleRequest* request);
 
   // Set the active view for the permission bubble. If this is NULL, it
   // means the permission bubble is no longer showing.
   virtual void SetView(PermissionBubbleView* view);
 
+ protected:
+  // Sets the coalesce time interval to |interval_ms|. For testing only.
+  void SetCoalesceIntervalForTesting(int interval_ms);
+
  private:
   friend class PermissionBubbleManagerTest;
   friend class content::WebContentsUserData<PermissionBubbleManager>;
@@ -50,6 +57,11 @@ class PermissionBubbleManager
   explicit PermissionBubbleManager(content::WebContents* web_contents);
 
   // contents::WebContentsObserver:
+  virtual void DidFinishLoad(
+      int64 frame_id,
+      const GURL& validated_url,
+      bool is_main_frame,
+      content::RenderViewHost* render_view_host) OVERRIDE;
   virtual void WebContentsDestroyed(
       content::WebContents* web_contents) OVERRIDE;
 
@@ -60,6 +72,9 @@ class PermissionBubbleManager
   virtual void Deny() OVERRIDE;
   virtual void Closing() OVERRIDE;
 
+  // Called when the coalescing timer is done. Presents the bubble.
+  void ShowBubble();
+
   // Finalize the pending permissions request.
   void FinalizeBubble();
 
@@ -70,8 +85,11 @@ class PermissionBubbleManager
   PermissionBubbleView* view_;
 
   std::vector<PermissionBubbleRequest*> requests_;
-  std::vector<bool> accept_state_;
+  std::vector<PermissionBubbleRequest*> queued_requests_;
+  std::vector<bool> accept_states_;
   bool customization_mode_;
+
+  scoped_ptr<base::Timer> timer_;
 };
 
 #endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_BUBBLE_MANAGER_H_