| Index: chrome/browser/guest_view/web_view/web_view_guest.cc
|
| diff --git a/chrome/browser/guest_view/web_view/web_view_guest.cc b/chrome/browser/guest_view/web_view/web_view_guest.cc
|
| index 1b0a4421959c11ac56f3d7180c942f5f11b1c75a..39f9ac9573e8cb25192f19eb1927c4ad9f2c32c1 100644
|
| --- a/chrome/browser/guest_view/web_view/web_view_guest.cc
|
| +++ b/chrome/browser/guest_view/web_view/web_view_guest.cc
|
| @@ -931,75 +931,34 @@ bool WebViewGuest::ClearData(const base::Time remove_since,
|
| }
|
|
|
| // static
|
| -void WebViewGuest::FileSystemAccessedAsync(int render_process_id,
|
| - int render_frame_id,
|
| - int request_id,
|
| - const GURL& url,
|
| - bool blocked_by_policy) {
|
| +void WebViewGuest::FileSystemAccessed(int render_process_id,
|
| + int render_frame_id,
|
| + const GURL& url,
|
| + bool blocked_by_policy,
|
| + base::Callback<void(bool)> callback) {
|
| WebViewGuest* guest =
|
| WebViewGuest::FromFrameID(render_process_id, render_frame_id);
|
| DCHECK(guest);
|
| guest->RequestFileSystemPermission(
|
| url,
|
| !blocked_by_policy,
|
| - base::Bind(&WebViewGuest::FileSystemAccessedAsyncResponse,
|
| - render_process_id,
|
| - render_frame_id,
|
| - request_id,
|
| - url));
|
| -}
|
| -
|
| -// static
|
| -void WebViewGuest::FileSystemAccessedAsyncResponse(int render_process_id,
|
| - int render_frame_id,
|
| - int request_id,
|
| - const GURL& url,
|
| - bool allowed) {
|
| - TabSpecificContentSettings::FileSystemAccessed(
|
| - render_process_id, render_frame_id, url, !allowed);
|
| - content::RenderFrameHost* render_frame_host =
|
| - content::RenderFrameHost::FromID(render_process_id, render_frame_id);
|
| - if (!render_frame_host)
|
| - return;
|
| - render_frame_host->Send(
|
| - new ChromeViewMsg_RequestFileSystemAccessAsyncResponse(
|
| - render_frame_id, request_id, allowed));
|
| -}
|
| -
|
| -// static
|
| -void WebViewGuest::FileSystemAccessedSync(int render_process_id,
|
| - int render_frame_id,
|
| - const GURL& url,
|
| - bool blocked_by_policy,
|
| - IPC::Message* reply_msg) {
|
| - WebViewGuest* guest =
|
| - WebViewGuest::FromFrameID(render_process_id, render_frame_id);
|
| - DCHECK(guest);
|
| - guest->RequestFileSystemPermission(
|
| - url,
|
| - !blocked_by_policy,
|
| - base::Bind(&WebViewGuest::FileSystemAccessedSyncResponse,
|
| + base::Bind(&WebViewGuest::FileSystemAccessedResponse,
|
| render_process_id,
|
| render_frame_id,
|
| url,
|
| - reply_msg));
|
| + callback));
|
| }
|
|
|
| // static
|
| -void WebViewGuest::FileSystemAccessedSyncResponse(int render_process_id,
|
| - int render_frame_id,
|
| - const GURL& url,
|
| - IPC::Message* reply_msg,
|
| - bool allowed) {
|
| +void WebViewGuest::FileSystemAccessedResponse(
|
| + int render_process_id,
|
| + int render_frame_id,
|
| + const GURL& url,
|
| + base::Callback<void(bool)> callback,
|
| + bool allowed) {
|
| TabSpecificContentSettings::FileSystemAccessed(
|
| render_process_id, render_frame_id, url, !allowed);
|
| - ChromeViewHostMsg_RequestFileSystemAccessSync::WriteReplyParams(reply_msg,
|
| - allowed);
|
| - content::RenderFrameHost* render_frame_host =
|
| - content::RenderFrameHost::FromID(render_process_id, render_frame_id);
|
| - if (!render_frame_id)
|
| - return;
|
| - render_frame_host->Send(reply_msg);
|
| + callback.Run(allowed);
|
| }
|
|
|
| WebViewGuest::~WebViewGuest() {
|
|
|