Chromium Code Reviews| 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 bb0ed1be0bba69c4ff16d024515d4d3445bc0300..d3da276baab61d0d3bcf35f851b25a9a0429c7cd 100644 |
| --- a/chrome/browser/renderer_host/chrome_render_message_filter.cc |
| +++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc |
| @@ -124,7 +124,10 @@ bool ChromeRenderMessageFilter::OnMessageReceived(const IPC::Message& message, |
| OnAddEventToExtensionActivityLog); |
| IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowDatabase, OnAllowDatabase) |
| IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowDOMStorage, OnAllowDOMStorage) |
| - IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowFileSystem, OnAllowFileSystem) |
| + IPC_MESSAGE_HANDLER(ChromeViewHostMsg_RequestFileSystemAccessSync, |
| + OnRequestFileSystemAccessSync) |
| + IPC_MESSAGE_HANDLER_GENERIC(ChromeViewHostMsg_RequestFileSystemAccessAsync, |
| + OnRequestFileSystemAccessAsync(message)) |
| IPC_MESSAGE_HANDLER(ChromeViewHostMsg_AllowIndexedDB, OnAllowIndexedDB) |
| IPC_MESSAGE_HANDLER(ChromeViewHostMsg_CanTriggerClipboardRead, |
| OnCanTriggerClipboardRead) |
| @@ -433,10 +436,11 @@ void ChromeRenderMessageFilter::OnAllowDOMStorage(int render_frame_id, |
| !*allowed)); |
| } |
| -void ChromeRenderMessageFilter::OnAllowFileSystem(int render_frame_id, |
| - const GURL& origin_url, |
| - const GURL& top_origin_url, |
| - bool* allowed) { |
| +void ChromeRenderMessageFilter::OnRequestFileSystemAccessSync( |
| + int render_frame_id, |
| + const GURL& origin_url, |
| + const GURL& top_origin_url, |
| + bool* allowed) { |
| *allowed = |
| cookie_settings_->IsSettingCookieAllowed(origin_url, top_origin_url); |
| // Record access to file system for potential display in UI. |
| @@ -446,6 +450,45 @@ void ChromeRenderMessageFilter::OnAllowFileSystem(int render_frame_id, |
| render_process_id_, render_frame_id, origin_url, !*allowed)); |
| } |
| +void ChromeRenderMessageFilter::OnRequestFileSystemAccessAsync( |
| + const IPC::Message& message) { |
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| + int request_id; |
| + GURL origin_url; |
| + GURL top_origin_url; |
| + if (!ChromeViewHostMsg_RequestFileSystemAccessAsync::Read( |
| + &message, &request_id, &origin_url, &top_origin_url)) { |
| + return; |
| + } |
| + |
| + bool allowed = |
| + cookie_settings_->IsSettingCookieAllowed(origin_url, top_origin_url); |
| + // Record access to file system for potential display in UI. |
| + BrowserThread::PostTaskAndReply( |
| + BrowserThread::UI, FROM_HERE, |
| + base::Bind( |
| + &TabSpecificContentSettings::FileSystemAccessed, |
| + render_process_id_, |
| + request_id, |
| + origin_url, |
| + !allowed), |
| + base::Bind( |
| + &ChromeRenderMessageFilter::OnRequestFileSyatemAccessAsyncCallbacks, |
| + base::Unretained(this), |
| + message.routing_id(), |
| + request_id, |
| + allowed)); |
| +} |
| + |
| +void ChromeRenderMessageFilter::OnRequestFileSyatemAccessAsyncCallbacks( |
|
Fady Samuel
2014/05/15 16:08:09
Spelling error: ChromeRenderMessageFilter::OnReque
Xi Han
2014/05/15 16:19:58
Done.
|
| + int routing_id, int render_frame_id, bool allowed) { |
| + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| + Send(new ChromeViewMsg_RequestFileSystemAccessAsyncResponse( |
| + routing_id, |
| + render_frame_id, |
| + allowed)); |
| +} |
| + |
| void ChromeRenderMessageFilter::OnAllowIndexedDB(int render_frame_id, |
| const GURL& origin_url, |
| const GURL& top_origin_url, |