[Quota] Pass user gesture state with quota request message.

chrome/browser/chrome_quota_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/chrome_quota_permission_context.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/prefs/pref_service.h"
@@ skipping 24 matching lines @@
 const int64 kRequestLargeQuotaThreshold = 5 * 1024 * 1024;
 
 // QuotaPermissionRequest ---------------------------------------------
 
 class QuotaPermissionRequest : public PermissionBubbleRequest {
  public:
   QuotaPermissionRequest(
       ChromeQuotaPermissionContext* context,
       const GURL& origin_url,
       int64 requested_quota,
+      bool user_gesture,
       const std::string& display_languages,
       const content::QuotaPermissionContext::PermissionCallback& callback);
 
   virtual ~QuotaPermissionRequest();
 
   // PermissionBubbleRequest:
   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:
   scoped_refptr<ChromeQuotaPermissionContext> context_;
   GURL origin_url_;
   std::string display_languages_;
   int64 requested_quota_;
+  bool user_gesture_;
   content::QuotaPermissionContext::PermissionCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(QuotaPermissionRequest);
 };
 
 QuotaPermissionRequest::QuotaPermissionRequest(
     ChromeQuotaPermissionContext* context,
     const GURL& origin_url,
     int64 requested_quota,
+    bool user_gesture,
     const std::string& display_languages,
     const content::QuotaPermissionContext::PermissionCallback& callback)
     : context_(context),
       origin_url_(origin_url),
       display_languages_(display_languages),
       requested_quota_(requested_quota),
+      user_gesture_(user_gesture),
       callback_(callback) {}
 
 QuotaPermissionRequest::~QuotaPermissionRequest() {}
 
 int QuotaPermissionRequest::GetIconID() const {
   // TODO(gbillock): get the proper image here
   return IDR_INFOBAR_WARNING;
 }
 
 base::string16 QuotaPermissionRequest::GetMessageText() const {
   return l10n_util::GetStringFUTF16(
       (requested_quota_ > kRequestLargeQuotaThreshold ?
           IDS_REQUEST_LARGE_QUOTA_INFOBAR_QUESTION :
           IDS_REQUEST_QUOTA_INFOBAR_QUESTION),
       net::FormatUrl(origin_url_, display_languages_));
 }
 
 base::string16 QuotaPermissionRequest::GetMessageTextFragment() const {
   return l10n_util::GetStringUTF16(IDS_REQUEST_QUOTA_PERMISSION_FRAGMENT);
 }
 
 bool QuotaPermissionRequest::HasUserGesture() const {
-  // TODO(gbillock): plumb this through
-  return false;
+  return user_gesture_;
 }
 
 GURL QuotaPermissionRequest::GetRequestingHostname() const {
   return origin_url_;
 }
 
 void QuotaPermissionRequest::PermissionGranted() {
   context_->DispatchCallbackOnIOThread(
       callback_,
       content::QuotaPermissionContext::QUOTA_PERMISSION_RESPONSE_ALLOW);
@@ skipping 126 matching lines @@
 
 }  // namespace
 
 
 // ChromeQuotaPermissionContext -----------------------------------------------
 
 ChromeQuotaPermissionContext::ChromeQuotaPermissionContext() {
 }
 
 void ChromeQuotaPermissionContext::RequestQuotaPermission(
-    const GURL& origin_url,
-    quota::StorageType type,
-    int64 requested_quota,
+    const content::RequestStorageQuotaParams& params,
     int render_process_id,
-    int render_view_id,
     const PermissionCallback& callback) {
-  if (type != quota::kStorageTypePersistent) {
+  if (params.storage_type != quota::kStorageTypePersistent) {
     // For now we only support requesting quota with this interface
     // for Persistent storage type.
     callback.Run(QUOTA_PERMISSION_RESPONSE_DISALLOW);
     return;
   }
 
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
     content::BrowserThread::PostTask(
         content::BrowserThread::UI, FROM_HERE,
         base::Bind(&ChromeQuotaPermissionContext::RequestQuotaPermission, this,
-                   origin_url, type, requested_quota, render_process_id,
-                   render_view_id, callback));
+                   params, render_process_id, callback));
     return;
   }
 
   content::WebContents* web_contents =
-      tab_util::GetWebContentsByID(render_process_id, render_view_id);
+      tab_util::GetWebContentsByID(render_process_id,
+                                   params.render_view_id);
   if (!web_contents) {
     // The tab may have gone away or the request may not be from a tab.
     LOG(WARNING) << "Attempt to request quota tabless renderer: "
-                 << render_process_id << "," << render_view_id;
+                 << render_process_id << "," << params.render_view_id;
     DispatchCallbackOnIOThread(callback, QUOTA_PERMISSION_RESPONSE_CANCELLED);
     return;
   }
 
   if (PermissionBubbleManager::Enabled()) {
     PermissionBubbleManager* bubble_manager =
         PermissionBubbleManager::FromWebContents(web_contents);
     bubble_manager->AddRequest(new QuotaPermissionRequest(this,
-            origin_url, requested_quota,
+            params.origin_url, params.requested_size, params.user_gesture,
             Profile::FromBrowserContext(web_contents->GetBrowserContext())->
                 GetPrefs()->GetString(prefs::kAcceptLanguages),
             callback));
     return;
   }
 
   InfoBarService* infobar_service =
       InfoBarService::FromWebContents(web_contents);
   if (!infobar_service) {
     // The tab has no infobar service.
     LOG(WARNING) << "Attempt to request quota from a background page: "
-                 << render_process_id << "," << render_view_id;
+                 << render_process_id << "," << params.render_view_id;
     DispatchCallbackOnIOThread(callback, QUOTA_PERMISSION_RESPONSE_CANCELLED);
     return;
   }
   RequestQuotaInfoBarDelegate::Create(
-      infobar_service, this, origin_url, requested_quota,
+      infobar_service, this, params.origin_url, params.requested_size,
       Profile::FromBrowserContext(web_contents->GetBrowserContext())->
           GetPrefs()->GetString(prefs::kAcceptLanguages),
       callback);
 }
 
 void ChromeQuotaPermissionContext::DispatchCallbackOnIOThread(
     const PermissionCallback& callback,
     QuotaPermissionResponse response) {
   DCHECK_EQ(false, callback.is_null());
 
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)) {
     content::BrowserThread::PostTask(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&ChromeQuotaPermissionContext::DispatchCallbackOnIOThread,
                    this, callback, response));
     return;
   }
 
   callback.Run(response);
 }
 
 ChromeQuotaPermissionContext::~ChromeQuotaPermissionContext() {}