Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(535)

Unified Diff: chrome/browser/guest_view/web_view/web_view_guest.cc

Issue 338353007: Implementation of shared worker code path for WebView file system permission. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master_sharedworker
Patch Set: Rename + changes are made. Created 6 years, 6 months 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
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 a2a86a479c966c1a7c67715cdee83ee8d39f3cf0..7de7406a13b82f0cca22ddd7b7b6971835fc7d8c 100644
--- a/chrome/browser/guest_view/web_view/web_view_guest.cc
+++ b/chrome/browser/guest_view/web_view/web_view_guest.cc
@@ -888,75 +888,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() {

Powered by Google App Engine
This is Rietveld 408576698