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

Index: content/browser/tab_contents/tab_contents.cc

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

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

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

@@ -32,7 +32,6 @@

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

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

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

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

#include "content/common/intents_messages.h"

#include "content/common/view_messages.h"

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

@@ -45,6 +44,7 @@

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

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

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

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

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

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

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

@@ -1060,8 +1060,8 @@

}

WebUI::TypeID TabContents::GetWebUITypeForCurrentState() {

- return content::WebUIFactory::Get()->GetWebUIType(GetBrowserContext(),

- GetURL());

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

+ GetWebUIType(GetBrowserContext(), GetURL());

}

WebUI* TabContents::GetWebUIForCurrentState() {

@@ -2170,7 +2170,8 @@

}

WebUI* TabContents::CreateWebUIForRenderManager(const GURL& url) {

- return content::WebUIFactory::Get()->CreateWebUIForURL(this, url);

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

+ CreateWebUIForURL(this, url);

}

NavigationEntry*