chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc - Issue 10353007: Extract a minimal subset of WebDialogUI/WebDialogDelegate from src/chrome -> src/ui/web_dialogs

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/ui/webui/chrome_web_ui_controller_factory.cc

Issue 10353007: Extract a minimal subset of WebDialogUI/WebDialogDelegate from src/chrome -> src/ui/web_dialogs Base URL: http://src.chromium.org/svn/trunk/src/

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

« chrome/browser/ui/browser_dialogs.h ('K') | « chrome/browser/ui/webui/chrome_web_dialog_web_contents_delegate.cc ('k') | chrome/browser/ui/webui/constrained_web_dialog_delegate_base.h » ('j') | chrome/browser/ui/webui/external_web_dialog_ui.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc

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

--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc (revision 135175)

+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc (working copy)

@@ -30,7 +30,8 @@

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

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

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

-#include "chrome/browser/ui/webui/web_dialog_ui.h"

+#include "ui/web_dialogs/web_dialog_ui.h"

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

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

#include "chrome/browser/ui/webui/media/media_internals_ui.h"

#include "chrome/browser/ui/webui/net_internals/net_internals_ui.h"

@@ -170,7 +171,7 @@

if (url.host() == chrome::kChromeUICloudPrintResourcesHost)

return &NewWebUI<ExternalWebDialogUI>;

if (url.host() == chrome::kChromeUICloudPrintSetupHost)

- return &NewWebUI<WebDialogUI>;

+ return &NewWebUI<web_dialogs::WebDialogUI>;

if (url.spec() == chrome::kChromeUIConstrainedHTMLTestURL)

return &NewWebUI<ConstrainedWebDialogUI>;

if (url.host() == chrome::kChromeUICrashesHost)

@@ -206,7 +207,7 @@

if (url.host() == chrome::kChromeUISyncInternalsHost)

return &NewWebUI<SyncInternalsUI>;

if (url.host() == chrome::kChromeUISyncResourcesHost)

- return &NewWebUI<WebDialogUI>;

+ return &NewWebUI<web_dialogs::WebDialogUI>;

if (url.host() == chrome::kChromeUITracingHost)

return &NewWebUI<TracingUI>;

if (url.host() == chrome::kChromeUIUberFrameHost)