[Media,Geolocation] Add permission bubble cancellation.

chrome/browser/geolocation/chrome_geolocation_permission_context.h

 // Copyright (c) 2012 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_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_H_
 #define CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_H_
 
+#include <map>
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/content_settings/permission_queue_controller.h"
 #include "content/public/browser/geolocation_permission_context.h"
 
 namespace content {
 class WebContents;
 }
 
+class GeolocationPermissionRequest;
 class PermissionRequestID;
 class Profile;
 
 // Chrome specific implementation of GeolocationPermissionContext; manages
 // Geolocation permissions flow, and delegates UI handling via
 // PermissionQueueController.
 class ChromeGeolocationPermissionContext
     : public content::GeolocationPermissionContext {
  public:
   explicit ChromeGeolocationPermissionContext(Profile* profile);
@@ skipping 52 matching lines @@
                                  const GURL& requesting_frame,
                                  const GURL& embedder,
                                  base::Callback<void(bool)> callback,
                                  bool allowed);
 
   // Create an PermissionQueueController. overriden in derived classes to
   // provide additional UI flow.  Called on the UI thread.
   virtual PermissionQueueController* CreateQueueController();
 
  private:
+  friend class GeolocationPermissionRequest;
+
   // Removes any pending InfoBar request.
   void CancelPendingInfobarRequest(const PermissionRequestID& id);
 
   // Creates and show an info bar.
   void CreateInfoBarRequest(const PermissionRequestID& id,
                             const GURL& requesting_frame,
                             const GURL& embedder,
                             const std::string accept_button_label,
                             base::Callback<void(bool)> callback);
 
+  // Notify the context that a particular request object is no longer needed.
+  void RequestFinished(GeolocationPermissionRequest* request);
+
   // These must only be accessed from the UI thread.
   Profile* const profile_;
   bool shutting_down_;
   scoped_ptr<PermissionQueueController> permission_queue_controller_;
 
+  std::map<std::string, GeolocationPermissionRequest*> pending_requests_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeGeolocationPermissionContext);
 };
 
 #endif  // CHROME_BROWSER_GEOLOCATION_CHROME_GEOLOCATION_PERMISSION_CONTEXT_H_