chrome/browser/webui/web_ui_factory.cc - Issue 6579003: Add in chrome://login-container

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

Issue 6579003: Add in chrome://login-container (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: changes made in response to Oshima's and Nikita's comments Created 9 years, 10 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/webui/web_ui_factory.cc

diff --git a/chrome/browser/webui/web_ui_factory.cc b/chrome/browser/webui/web_ui_factory.cc

index 6cd39b1ca8f271964ae21d1eb7e94b8a2e69fa67..34041d5cee6b68713587d266416eeaeffe4be411 100644

--- a/chrome/browser/webui/web_ui_factory.cc

+++ b/chrome/browser/webui/web_ui_factory.cc

@@ -55,6 +55,7 @@

#endif

#if defined(TOUCH_UI) && defined(OS_CHROMEOS)

+#include "chrome/browser/chromeos/webui/login/login_container_ui.h"

#include "chrome/browser/chromeos/webui/login/login_ui.h"

#endif

@@ -225,6 +226,8 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,

#if defined(TOUCH_UI) && defined(OS_CHROMEOS)

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

return &NewWebUI<chromeos::LoginUI>;

+ if (url.host() == chrome::kChromeUILoginContainerHost)

+ return &NewWebUI<chromeos::LoginContainerUI>;

#endif

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