Handles iframe permissions requests separately, in a subsequent bubble.

chrome/browser/ui/website_settings/permission_bubble_manager.h

 // Copyright 2014 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_WEBSITE_SETTINGS_PERMISSION_BUBBLE_MANAGER_H_
 #define CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_BUBBLE_MANAGER_H_
 
 #include <vector>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 47 matching lines @@
   virtual void SetView(PermissionBubbleView* view) OVERRIDE;
 
  private:
   friend class PermissionBubbleManagerTest;
   friend class DownloadRequestLimiterTest;
   friend class content::WebContentsUserData<PermissionBubbleManager>;
 
   explicit PermissionBubbleManager(content::WebContents* web_contents);
 
   // WebContentsObserver:
-
-  // TODO(leng): Finalize policy for permission requests with iFrames.
-  // DocumentLoadedInFrame() might be needed as well.
   virtual void DocumentOnLoadCompletedInMainFrame() OVERRIDE;
+  virtual void DocumentLoadedInFrame(
+      int64 frame_id,
+      content::RenderViewHost* render_view_host) OVERRIDE;
 
   // If a page on which permissions requests are pending is navigated,
   // they will be finalized as if canceled by the user.
   virtual void NavigationEntryCommitted(
       const content::LoadCommittedDetails& details) OVERRIDE;
   virtual void WebContentsDestroyed() OVERRIDE;
 
   // PermissionBubbleView::Delegate:
   virtual void ToggleAccept(int request_index, bool new_value) OVERRIDE;
   virtual void SetCustomizationMode() OVERRIDE;
   virtual void Accept() OVERRIDE;
   virtual void Deny() OVERRIDE;
   virtual void Closing() OVERRIDE;
 
-  void ShowBubble();
+  // Posts a task which will allow the bubble to become visible if it is needed.
+  void ScheduleShowBubble();
+
+  // Shows the bubble if it is not already visible and there are pending
+  // requests.
+  void TriggerShowBubble();
 
   // Finalize the pending permissions request.
   void FinalizeBubble();
 
   // Cancel any pending requests. This is called if the WebContents
   // on which permissions calls are pending is destroyed or navigated away
   // from the requesting page.
   void CancelPendingQueue();
 
+  // Returns whether or not |request| has already been added to |queue|.
+  // If |exact_duplicate| is non-null, it will be set to true if |request|
+  // is the same object as an existing request in |queue|.
+  bool ExistingRequest(PermissionBubbleRequest* request,
+                       const std::vector<PermissionBubbleRequest*>& queue,
+                       bool* exact_dupcliate);

[Greg Billock, 2014/05/21 17:09:19]

sp

[leng, 2014/05/22 00:08:47]

Done.

+
   // Whether or not we are showing the bubble in this tab.
   bool bubble_showing_;
 
   // Set to the UI surface to be used to display the permissions requests.
   PermissionBubbleView* view_;
 
   std::vector<PermissionBubbleRequest*> requests_;
   std::vector<PermissionBubbleRequest*> queued_requests_;
+  std::vector<PermissionBubbleRequest*> queued_frame_requests_;
 
   // URL of the main frame in the WebContents to which this manager is attached.
   // TODO(gbillock): if there are iframes in the page, we need to deal with it.
   GURL request_url_;
   bool request_url_has_loaded_;
 
   std::vector<bool> accept_states_;
   bool customization_mode_;
 
   base::WeakPtrFactory<PermissionBubbleManager> weak_factory_;
 };
 
 #endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_BUBBLE_MANAGER_H_