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

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

Issue 9288074: Rename WebUIFactory to WebUIControllerFactory since that's what it creates now. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: blah Created 8 years, 11 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
« no previous file with comments | « content/browser/mock_content_browser_client.cc ('k') | content/browser/site_instance_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/render_process_host_impl.cc
===================================================================
--- content/browser/renderer_host/render_process_host_impl.cc (revision 119190)
+++ content/browser/renderer_host/render_process_host_impl.cc (working copy)
@@ -89,7 +89,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/render_view_host_delegate.h"
#include "content/public/browser/user_metrics.h"
-#include "content/public/browser/web_ui_factory.h"
+#include "content/public/browser/web_ui_controller_factory.h"
#include "content/public/common/content_constants.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/process_type.h"
@@ -119,6 +119,7 @@
using content::ChildProcessHost;
using content::ChildProcessHostImpl;
using content::UserMetricsAction;
+using content::WebUIControllerFactory;
// This class creates the IO thread for the renderer when running in
// single-process mode. It's not used in multi-process mode.
@@ -1092,11 +1093,14 @@
if (host->GetBrowserContext() != browser_context)
return false;
- if (ChildProcessSecurityPolicy::GetInstance()->HasWebUIBindings(
+ WebUIControllerFactory* factory =
+ content::GetContentClient()->browser()->GetWebUIControllerFactory();
+ if (factory &&
+ ChildProcessSecurityPolicy::GetInstance()->HasWebUIBindings(
host->GetID()) !=
- content::GetContentClient()->browser()->GetWebUIFactory()->
- UseWebUIBindingsForURL(browser_context, site_url))
+ factory->UseWebUIBindingsForURL(browser_context, site_url)) {
return false;
+ }
return content::GetContentClient()->browser()->IsSuitableHost(host, site_url);
}
« no previous file with comments | « content/browser/mock_content_browser_client.cc ('k') | content/browser/site_instance_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698