Location chooser

chrome/browser/ui/website_settings/permission_bubble_manager.cc

Index: chrome/browser/ui/website_settings/permission_bubble_manager.cc
diff --git a/chrome/browser/ui/website_settings/permission_bubble_manager.cc b/chrome/browser/ui/website_settings/permission_bubble_manager.cc
index e54e40a2480612b167f3ce8f26f77595a096126b..5ba9331b92d44b5f6627ac54b07f45aed678489b 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_manager.cc
+++ b/chrome/browser/ui/website_settings/permission_bubble_manager.cc
@@ -24,6 +24,10 @@ class CancelledRequest : public PermissionBubbleRequest {
         hostname_(cancelled->GetRequestingHostname()) {}
   virtual ~CancelledRequest() {}
 
+  virtual PermissionBubbleRequest::Type GetType() const OVERRIDE {
+    return PermissionBubbleRequest::Type::kOther;
+  }
+
   virtual int GetIconID() const OVERRIDE {
     return icon_;
   }
@@ -271,13 +275,18 @@ void PermissionBubbleManager::SetCustomizationMode() {
 }
 
 void PermissionBubbleManager::Accept() {
+  Accept(-1);
+}
+
+void PermissionBubbleManager::Accept(int choice) {
+  // Currently the only call to this is through Geolocation request.
   std::vector<PermissionBubbleRequest*>::iterator requests_iter;
   std::vector<bool>::iterator accepts_iter = accept_states_.begin();
   for (requests_iter = requests_.begin(), accepts_iter = accept_states_.begin();
        requests_iter != requests_.end();
        requests_iter++, accepts_iter++) {
     if (*accepts_iter)
-      (*requests_iter)->PermissionGranted();
+      (*requests_iter)->PermissionGranted(choice);
     else
       (*requests_iter)->PermissionDenied();
   }