| 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 dfb7b8745e1a448910b41aaa4473ccc57a9d459e..ef49c8e5a6822081cd281ca89dcd4ee539722eab 100644
|
| --- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| +++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
|
| @@ -227,10 +227,11 @@ void ChromeRenderMessageFilter::FileSystemAccessedSyncOnUIThread(
|
| 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);
|
| + extensions::WebViewPermissionHelper* web_view_permission_helper =
|
| + extensions::WebViewPermissionHelper::FromFrameID(
|
| + render_process_id, render_frame_id);
|
| // Between the time the permission request is made and the time it is handled
|
| - // by the UI thread, the WebViewPermissionHelper might be gone.
|
| + // by the UI thread, the extensions::WebViewPermissionHelper might be gone.
|
| if (!web_view_permission_helper)
|
| return;
|
| web_view_permission_helper->FileSystemAccessedSync(
|
| @@ -275,8 +276,8 @@ void ChromeRenderMessageFilter::OnRequestFileSystemAccess(
|
| cookie_settings_->IsSettingCookieAllowed(origin_url, top_origin_url);
|
|
|
| #if defined(ENABLE_EXTENSIONS)
|
| - bool is_web_view_guest =
|
| - WebViewRendererState::GetInstance()->IsGuest(render_process_id_);
|
| + bool is_web_view_guest = extensions::WebViewRendererState::GetInstance()
|
| + ->IsGuest(render_process_id_);
|
| if (is_web_view_guest) {
|
| // Record access to file system for potential display in UI.
|
| BrowserThread::PostTask(
|
| @@ -311,10 +312,11 @@ void ChromeRenderMessageFilter::FileSystemAccessedOnUIThread(
|
| bool allowed,
|
| base::Callback<void(bool)> callback) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| - WebViewPermissionHelper* web_view_permission_helper =
|
| - WebViewPermissionHelper::FromFrameID(render_process_id, render_frame_id);
|
| + extensions::WebViewPermissionHelper* web_view_permission_helper =
|
| + extensions::WebViewPermissionHelper::FromFrameID(
|
| + render_process_id, render_frame_id);
|
| // Between the time the permission request is made and the time it is handled
|
| - // by the UI thread, the WebViewPermissionHelper might be gone.
|
| + // by the UI thread, the extensions::WebViewPermissionHelper might be gone.
|
| if (!web_view_permission_helper)
|
| return;
|
| web_view_permission_helper->RequestFileSystemPermission(
|
|
|