chrome/browser/extensions/extension_host.cc - Issue 6713082: Move WebUIFactory to chrome/browser.

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: chrome/browser/extensions/extension_host.cc

Issue 6713082: Move WebUIFactory to chrome/browser. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge Created 9 years, 9 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:

Index: chrome/browser/extensions/extension_host.cc

diff --git a/chrome/browser/extensions/extension_host.cc b/chrome/browser/extensions/extension_host.cc

index f4f979a9d42360c5c89591c35c65c3205f373b39..7e3b6d239b5706830ea5c5b151870c5d85cce592 100644

--- a/chrome/browser/extensions/extension_host.cc

+++ b/chrome/browser/extensions/extension_host.cc

@@ -26,6 +26,7 @@

#include "chrome/browser/tab_contents/popup_menu_helper_mac.h"

#include "chrome/browser/ui/app_modal_dialogs/message_box_handler.h"

#include "chrome/browser/ui/browser.h"

+#include "chrome/browser/ui/webui/web_ui_factory.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/bindings_policy.h"

#include "chrome/common/extensions/extension.h"

@@ -41,7 +42,6 @@

#include "content/browser/site_instance.h"

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

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

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

#include "content/common/native_web_keyboard_event.h"

#include "content/common/notification_service.h"

#include "content/common/view_messages.h"

@@ -573,8 +573,8 @@ void ExtensionHost::CreateNewWindow(

route_id,

render_view_host()->process()->profile(),

site_instance(),

- WebUIFactory::GetWebUIType(render_view_host()->process()->profile(),

- url_),

+ WebUIFactory::GetInstance()->GetWebUIType(

+ render_view_host()->process()->profile(), url_),

this,

params.window_container_type,

params.frame_name);