[Geolocation] Enable content settings write using permissions bubbles.

chrome/browser/geolocation/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/geolocation_permission_context.h"
 
 #include <functional>
 #include <string>
 #include <vector>
 
@@ skipping 16 matching lines @@
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 
 class GeolocationPermissionRequest : public PermissionBubbleRequest {
  public:
   GeolocationPermissionRequest(GeolocationPermissionContext* context,
                                const PermissionRequestID& id,
                                const GURL& requesting_frame,
                                bool user_gesture,
+                               const GURL& embedder,

[Michael van Ouwerkerk, 2014/07/01 12:55:59]

Nit: move this before user_gesture so it is paired with requesting_frame as
elsewhere.

[Greg Billock, 2014/07/01 17:03:33]

Done.

                                base::Callback<void(bool)> callback,
                                const std::string& display_languages);
   virtual ~GeolocationPermissionRequest();
 
   // PermissionBubbleDelegate:
   virtual int GetIconID() const OVERRIDE;
   virtual base::string16 GetMessageText() const OVERRIDE;
   virtual base::string16 GetMessageTextFragment() const OVERRIDE;
   virtual bool HasUserGesture() const OVERRIDE;
   virtual GURL GetRequestingHostname() const OVERRIDE;
   virtual void PermissionGranted() OVERRIDE;
   virtual void PermissionDenied() OVERRIDE;
   virtual void Cancelled() OVERRIDE;
   virtual void RequestFinished() OVERRIDE;
 
  private:
   GeolocationPermissionContext* context_;
   PermissionRequestID id_;
   GURL requesting_frame_;
   bool user_gesture_;
+  GURL embedder_;
   base::Callback<void(bool)> callback_;
   std::string display_languages_;
 };
 
 GeolocationPermissionRequest::GeolocationPermissionRequest(
     GeolocationPermissionContext* context,
     const PermissionRequestID& id,
     const GURL& requesting_frame,
     bool user_gesture,
+    const GURL& embedder,
     base::Callback<void(bool)> callback,
     const std::string& display_languages)
     : context_(context),
       id_(id),
       requesting_frame_(requesting_frame),
       user_gesture_(user_gesture),
+      embedder_(embedder),
       callback_(callback),
       display_languages_(display_languages) {}
 
 GeolocationPermissionRequest::~GeolocationPermissionRequest() {}
 
 int GeolocationPermissionRequest::GetIconID() const {
   return IDR_INFOBAR_GEOLOCATION;
 }
 
 base::string16 GeolocationPermissionRequest::GetMessageText() const {
   return l10n_util::GetStringFUTF16(IDS_GEOLOCATION_INFOBAR_QUESTION,
       net::FormatUrl(requesting_frame_, display_languages_));
 }
 
 base::string16 GeolocationPermissionRequest::GetMessageTextFragment() const {
   return l10n_util::GetStringUTF16(IDS_GEOLOCATION_INFOBAR_PERMISSION_FRAGMENT);
 }
 
 bool GeolocationPermissionRequest::HasUserGesture() const {
   return user_gesture_;
 }
 
 GURL GeolocationPermissionRequest::GetRequestingHostname() const {
   return requesting_frame_;
 }
 
 void GeolocationPermissionRequest::PermissionGranted() {
+  context_->QueueController()->UpdateContentSetting(
+      requesting_frame_, embedder_, true);
   context_->NotifyPermissionSet(id_, requesting_frame_, callback_, true);
 }
 
 void GeolocationPermissionRequest::PermissionDenied() {
+  context_->QueueController()->UpdateContentSetting(
+      requesting_frame_, embedder_, false);
   context_->NotifyPermissionSet(id_, requesting_frame_, callback_, false);
 }
 
 void GeolocationPermissionRequest::Cancelled() {
 }
 
 void GeolocationPermissionRequest::RequestFinished() {
   // Deletes 'this'.
   context_->RequestFinished(this);
 }
@@ skipping 94 matching lines @@
     case CONTENT_SETTING_ALLOW:
       PermissionDecided(id, requesting_frame, embedder, callback, true);
       break;
     default:
       if (PermissionBubbleManager::Enabled()) {
         PermissionBubbleManager* mgr =
             PermissionBubbleManager::FromWebContents(web_contents);
         if (mgr) {
           scoped_ptr<GeolocationPermissionRequest> request_ptr(
               new GeolocationPermissionRequest(
-                  this, id, requesting_frame, user_gesture, callback,
+                  this, id, requesting_frame, user_gesture, embedder, 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(
@@ skipping 92 matching lines @@
     if (cancelling != NULL && web_contents != NULL &&
         PermissionBubbleManager::FromWebContents(web_contents) != NULL) {
       PermissionBubbleManager::FromWebContents(web_contents)->
           CancelRequest(cancelling);
     }
     return;
   }
 
   QueueController()->CancelInfoBarRequest(id);
 }