chrome/browser/download/download_request_limiter.h - Issue 1467563002: Use ResourceRequestInfo::GetWebContents in DownloadRequestLimiter

Unified Diff: chrome/browser/download/download_request_limiter.h

Issue 1467563002: Use ResourceRequestInfo::GetWebContents in DownloadRequestLimiter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@web-contents-callback

Patch Set: Addressed Asanka's comments Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/android/download/mock_download_controller_android.cc ('k') | chrome/browser/download/download_request_limiter.cc » ('j') | content/browser/loader/resource_request_info_impl.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/download/download_request_limiter.h

diff --git a/chrome/browser/download/download_request_limiter.h b/chrome/browser/download/download_request_limiter.h

index 50ea982aa3adc519927d826ed870d3fdb405391b..4fa39dde98643f1ec8b2f4c2dcca0b552c050697 100644

--- a/chrome/browser/download/download_request_limiter.h

+++ b/chrome/browser/download/download_request_limiter.h

@@ -16,6 +16,7 @@

#include "components/content_settings/core/common/content_settings.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_registrar.h"

+#include "content/public/browser/resource_request_info.h"

#include "content/public/browser/web_contents_observer.h"

class HostContentSettingsMap;

@@ -182,8 +183,8 @@ class DownloadRequestLimiter

DownloadStatus GetDownloadStatus(content::WebContents* tab);

// Check if download can proceed and notifies the callback on UI thread.

- void CanDownload(int render_process_host_id,

- int render_view_id,

+ void CanDownload(const content::ResourceRequestInfo::WebContentsGetter&

+ web_contents_getter,

davidben 2015/12/01 22:15:15 [Hrmf. I was going to suggest this ought to be a W

clamy 2015/12/02 09:34:00 Acknowledged.

const GURL& url,

const std::string& request_method,

const Callback& callback);

@@ -215,11 +216,12 @@ class DownloadRequestLimiter

const Callback& callback);

// Invoked when decision to download has been made.

- void OnCanDownloadDecided(int render_process_host_id,

- int render_view_id,

- const std::string& request_method,

- const Callback& orig_callback,

- bool allow);

+ void OnCanDownloadDecided(

+ const content::ResourceRequestInfo::WebContentsGetter&

+ web_contents_getter,

+ const std::string& request_method,

+ const Callback& orig_callback,

+ bool allow);

// Removes the specified TabDownloadState from the internal map and deletes

// it. This has the effect of resetting the status for the tab to