[Media,Geolocation] Add permission bubble cancellation.

chrome/browser/geolocation/chrome_geolocation_permission_context.cc

 // 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.
 
 #include "chrome/browser/geolocation/chrome_geolocation_permission_context.h"
 
 #include <functional>
 #include <string>
 #include <vector>
 
@@ skipping 96 matching lines @@
 
 void GeolocationPermissionRequest::PermissionGranted() {
   context_->NotifyPermissionSet(id_, requesting_frame_, callback_, true);
 }
 
 void GeolocationPermissionRequest::PermissionDenied() {
   context_->NotifyPermissionSet(id_, requesting_frame_, callback_, false);
 }
 
 void GeolocationPermissionRequest::Cancelled() {
-  context_->NotifyPermissionSet(id_, requesting_frame_, callback_, false);
 }
 
 void GeolocationPermissionRequest::RequestFinished() {
-  delete this;
+  // Deletes 'this'.
+  context_->RequestFinished(this);
 }
 
 
 ChromeGeolocationPermissionContext::ChromeGeolocationPermissionContext(
     Profile* profile)
     : profile_(profile),
       shutting_down_(false) {
 }
 
 ChromeGeolocationPermissionContext::~ChromeGeolocationPermissionContext() {
@@ skipping 71 matching lines @@
 void ChromeGeolocationPermissionContext::CancelGeolocationPermissionRequest(
     content::WebContents* web_contents,
     int bridge_id,
     const GURL& requesting_frame) {
   WebViewGuest* guest =
       web_contents ? WebViewGuest::FromWebContents(web_contents) : NULL;
   if (guest) {
     guest->CancelGeolocationPermissionRequest(bridge_id);
     return;
   }
-  // TODO(gbillock): cancel permission bubble request.
   int render_process_id = web_contents->GetRenderProcessHost()->GetID();
   int render_view_id = web_contents->GetRenderViewHost()->GetRoutingID();
   CancelPendingInfobarRequest(PermissionRequestID(
       render_process_id, render_view_id, bridge_id, 0));
 }
 
 void ChromeGeolocationPermissionContext::DecidePermission(
     content::WebContents* web_contents,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
@@ skipping 12 matching lines @@
       PermissionDecided(id, requesting_frame, embedder, callback, false);
       break;
     case CONTENT_SETTING_ALLOW:
       PermissionDecided(id, requesting_frame, embedder, callback, true);
       break;
     default:
       if (PermissionBubbleManager::Enabled()) {
         PermissionBubbleManager* mgr =
             PermissionBubbleManager::FromWebContents(web_contents);
         if (mgr) {
-          mgr->AddRequest(new GeolocationPermissionRequest(
+          scoped_ptr<GeolocationPermissionRequest> request_ptr(
+              new GeolocationPermissionRequest(
                   this, id, requesting_frame, user_gesture, callback,
                   profile_->GetPrefs()->GetString(prefs::kAcceptLanguages)));
+          GeolocationPermissionRequest* request = request_ptr.get();
+          pending_requests_.add(id.ToString(), request_ptr.Pass());
+          mgr->AddRequest(request);
         }
       } else {
         // setting == ask. Prompt the user.
         QueueController()->CreateInfoBarRequest(
             id, requesting_frame, embedder, accept_button_label,
                 base::Bind(
                     &ChromeGeolocationPermissionContext::NotifyPermissionSet,
                 base::Unretained(this), id, requesting_frame, callback));
       }
   }
 }
 
 void ChromeGeolocationPermissionContext::CreateInfoBarRequest(
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
     const std::string accept_button_label,
     base::Callback<void(bool)> callback) {
     QueueController()->CreateInfoBarRequest(
         id, requesting_frame, embedder, accept_button_label, base::Bind(
             &ChromeGeolocationPermissionContext::NotifyPermissionSet,
             base::Unretained(this), id, requesting_frame, callback));
 }
 
+void ChromeGeolocationPermissionContext::RequestFinished(
+    GeolocationPermissionRequest* request) {
+  base::ScopedPtrHashMap<std::string,
+                         GeolocationPermissionRequest>::iterator it;
+  for (it = pending_requests_.begin(); it != pending_requests_.end(); it++) {
+    if (it->second == request) {
+      pending_requests_.take_and_erase(it);
+      return;
+    }
+  }
+}
+
+
 void ChromeGeolocationPermissionContext::ShutdownOnUIThread() {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   permission_queue_controller_.reset();
   shutting_down_ = true;
 }
 
 void ChromeGeolocationPermissionContext::PermissionDecided(
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     const GURL& embedder,
@@ skipping 36 matching lines @@
   return new PermissionQueueController(profile(),
                                        CONTENT_SETTINGS_TYPE_GEOLOCATION);
 }
 
 void ChromeGeolocationPermissionContext::CancelPendingInfobarRequest(
     const PermissionRequestID& id) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
   if (shutting_down_)
     return;
 
-  // TODO(gbillock): handle permission bubble cancellation.
+  if (PermissionBubbleManager::Enabled()) {
+    GeolocationPermissionRequest* cancelling =
+        pending_requests_.get(id.ToString());
+    content::WebContents* web_contents = tab_util::GetWebContentsByID(
+        id.render_process_id(), id.render_view_id());
+    if (cancelling != NULL && web_contents != NULL &&
+        PermissionBubbleManager::FromWebContents(web_contents) != NULL) {
+      PermissionBubbleManager::FromWebContents(web_contents)->
+          CancelRequest(cancelling);
+    }
+    return;
+  }
+
   QueueController()->CancelInfoBarRequest(id);
 }