content/browser/tab_contents/render_view_host_manager.cc - Issue 9097005: Move WebUIFactory into content/public/browser and make it use WebContents instead of TabContents....

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/tab_contents/render_view_host_manager.cc

Issue 9097005: Move WebUIFactory into content/public/browser and make it use WebContents instead of TabContents.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync 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/renderer_host/render_process_host_impl.cc ('k') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/tab_contents/render_view_host_manager.cc

===================================================================

--- content/browser/tab_contents/render_view_host_manager.cc (revision 116777)

+++ content/browser/tab_contents/render_view_host_manager.cc (working copy)

@@ -16,11 +16,11 @@

#include "content/browser/tab_contents/navigation_entry_impl.h"

#include "content/browser/tab_contents/tab_contents_view.h"

#include "content/browser/webui/web_ui.h"

-#include "content/browser/webui/web_ui_factory.h"

#include "content/public/browser/notification_service.h"

#include "content/common/view_messages.h"

#include "content/public/browser/content_browser_client.h"

#include "content/public/browser/notification_types.h"

+#include "content/public/browser/web_ui_factory.h"

#include "content/public/common/content_switches.h"

#include "content/public/common/url_constants.h"

@@ -344,7 +344,8 @@

render_view_host_->site_instance()->site();

content::BrowserContext* browser_context =

delegate_->GetControllerForRenderManager().GetBrowserContext();

- const content::WebUIFactory* web_ui_factory = content::WebUIFactory::Get();

+ const content::WebUIFactory* web_ui_factory =

+ content::GetContentClient()->browser()->GetWebUIFactory();

if (web_ui_factory->UseWebUIForURL(browser_context, current_url)) {

// Force swap if it's not an acceptable URL for Web UI.

if (!web_ui_factory->IsURLAcceptableForWebUI(browser_context,