Index: chrome/browser/renderer_host/chrome_render_message_filter.cc |
diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc |
index 3307d3418cabc0a9d381e32fdae65f905c0d32b7..d2a4d6a624e06397d671f41b0bb0f3187e4f3b20 100644 |
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc |
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc |
@@ -208,14 +208,16 @@ void ChromeRenderMessageFilter::OnRequestFileSystemAccessSync( |
WebViewRendererState::GetInstance()->IsGuest(render_process_id_); |
if (is_web_view_guest) { |
// Record access to file system for potential display in UI. |
- BrowserThread::PostTask(BrowserThread::UI, |
- FROM_HERE, |
- base::Bind(&WebViewGuest::FileSystemAccessedSync, |
- render_process_id_, |
- render_frame_id, |
- origin_url, |
- !allowed, |
- reply_msg)); |
+ BrowserThread::PostTask( |
+ BrowserThread::UI, |
+ FROM_HERE, |
+ base::Bind(&ChromeRenderMessageFilter:: |
+ FileSystemAccessedSyncTaskPostedToUIThread, |
+ render_process_id_, |
+ render_frame_id, |
+ origin_url, |
+ !allowed, |
+ reply_msg)); |
return; |
} |
#endif |
@@ -233,6 +235,23 @@ void ChromeRenderMessageFilter::OnRequestFileSystemAccessSync( |
!allowed)); |
} |
+void ChromeRenderMessageFilter::FileSystemAccessedSyncTaskPostedToUIThread( |
Fady Samuel
2014/07/08 16:31:03
The name is way too long.
FileSystemAccessedSyncO
Xi Han
2014/07/08 19:03:34
Done.
|
+ int render_process_id, |
+ int render_frame_id, |
+ const GURL& url, |
+ bool blocked_by_policy, |
+ IPC::Message* reply_msg) |
+{ |
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ WebViewPermissionHelper* web_view_permission_helper = |
+ WebViewPermissionHelper::FromFrameID(render_process_id, render_frame_id); |
+ web_view_permission_helper->FileSystemAccessedSync(render_process_id, |
+ render_frame_id, |
+ url, |
+ blocked_by_policy, |
+ reply_msg); |
+} |
+ |
void ChromeRenderMessageFilter::OnRequestFileSystemAccessAsync( |
int render_frame_id, |
int request_id, |
@@ -248,14 +267,16 @@ void ChromeRenderMessageFilter::OnRequestFileSystemAccessAsync( |
WebViewRendererState::GetInstance()->IsGuest(render_process_id_); |
if (is_web_view_guest) { |
// Record access to file system for potential display in UI. |
- BrowserThread::PostTask(BrowserThread::UI, |
- FROM_HERE, |
- base::Bind(&WebViewGuest::FileSystemAccessedAsync, |
- render_process_id_, |
- render_frame_id, |
- request_id, |
- origin_url, |
- !allowed)); |
+ BrowserThread::PostTask( |
+ BrowserThread::UI, |
+ FROM_HERE, |
+ base::Bind(&ChromeRenderMessageFilter:: |
+ FileSystemAccessedAsyncTaskPostedToUIThread, |
+ render_process_id_, |
+ render_frame_id, |
+ request_id, |
+ origin_url, |
+ !allowed)); |
return; |
} |
#endif |
@@ -273,6 +294,22 @@ void ChromeRenderMessageFilter::OnRequestFileSystemAccessAsync( |
!allowed)); |
} |
+void ChromeRenderMessageFilter::FileSystemAccessedAsyncTaskPostedToUIThread( |
Fady Samuel
2014/07/08 16:31:03
FileSystemAccessedAsyncOnUIThread
Xi Han
2014/07/08 19:03:34
Done.
|
+ int render_process_id, |
+ int render_frame_id, |
+ int request_id, |
+ const GURL& url, |
+ bool blocked_by_policy) { |
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
+ WebViewPermissionHelper* web_view_permission_helper = |
+ WebViewPermissionHelper::FromFrameID(render_process_id, render_frame_id); |
+ web_view_permission_helper->FileSystemAccessedAsync(render_process_id, |
+ render_frame_id, |
+ request_id, |
+ url, |
+ blocked_by_policy); |
+} |
+ |
void ChromeRenderMessageFilter::OnAllowIndexedDB(int render_frame_id, |
const GURL& origin_url, |
const GURL& top_origin_url, |