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

Unified Diff: content/browser/renderer_host/render_message_filter.cc

Issue 12319119: Fix layering violation in content\browser\renderer_host. That directory shouldn't be including web_… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years, 10 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: content/browser/renderer_host/render_message_filter.cc
===================================================================
--- content/browser/renderer_host/render_message_filter.cc (revision 184684)
+++ content/browser/renderer_host/render_message_filter.cc (working copy)
@@ -29,7 +29,6 @@
#include "content/browser/renderer_host/render_process_host_impl.h"
#include "content/browser/renderer_host/render_view_host_delegate.h"
#include "content/browser/renderer_host/render_widget_helper.h"
-#include "content/browser/web_contents/web_contents_impl.h"
#include "content/common/child_process_host_impl.h"
#include "content/common/child_process_messages.h"
#include "content/common/desktop_notification_messages.h"
@@ -201,22 +200,6 @@
int request_id_;
};
-void RaiseInfobarForBlocked3DContentOnUIThread(
- int render_process_id,
- int render_view_id,
- const GURL& url,
- content::ThreeDAPIType requester) {
- RenderViewHost* rvh = RenderViewHost::FromID(
- render_process_id, render_view_id);
- if (!rvh)
- return;
- WebContentsImpl* web_contents = static_cast<WebContentsImpl*>(
- WebContents::FromRenderViewHost(rvh));
- if (!web_contents)
- return;
- web_contents->DidBlock3DAPIs(url, requester);
-}
-
} // namespace
class RenderMessageFilter::OpenChannelToNpapiPluginCallback
@@ -1074,17 +1057,8 @@
const GURL& top_origin_url,
ThreeDAPIType requester,
bool* blocked) {
- GpuDataManagerImpl::DomainBlockStatus block_status =
- GpuDataManagerImpl::GetInstance()->Are3DAPIsBlocked(top_origin_url);
- *blocked = (block_status !=
- GpuDataManagerImpl::DOMAIN_BLOCK_STATUS_NOT_BLOCKED);
- if (*blocked) {
- BrowserThread::PostTask(
- BrowserThread::UI, FROM_HERE,
- base::Bind(&RaiseInfobarForBlocked3DContentOnUIThread,
- render_process_id_, render_view_id,
- top_origin_url, requester));
- }
+ *blocked = GpuDataManagerImpl::GetInstance()->Are3DAPIsBlocked(
+ top_origin_url, render_process_id_, render_view_id, requester);
}
void RenderMessageFilter::OnDidLose3DContext(
« no previous file with comments | « content/browser/renderer_host/media/DEPS ('k') | content/browser/renderer_host/render_widget_host_view_guest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698