Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(746)

Unified Diff: chrome/browser/webui/web_ui_factory.cc

Issue 6577003: Entire DOMBrowser stack (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/opaque_browser_frame_view.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..9dcb3802f7e8dd23aa2d51a8a3876ef11033dcd4 100644
--- a/chrome/browser/webui/web_ui_factory.cc
+++ b/chrome/browser/webui/web_ui_factory.cc
@@ -56,6 +56,7 @@
#if defined(TOUCH_UI) && defined(OS_CHROMEOS)
#include "chrome/browser/chromeos/webui/login/login_ui.h"
+#include "chrome/browser/chromeos/webui/login/login_container_ui.h"
#endif
#if defined(OS_WIN)
@@ -222,9 +223,11 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
}
#endif // defined(OS_CHROMEOS)
-#if defined(TOUCH_UI) && defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
if (url.host() == chrome::kChromeUILoginHost)
return &NewWebUI<chromeos::LoginUI>;
+ if (url.host() == chrome::kChromeUILoginContainerHost)
+ return &NewWebUI<chromeos::LoginContainerUI>;
#endif
if (url.spec() == chrome::kChromeUIConstrainedHTMLTestURL)
« no previous file with comments | « chrome/browser/ui/views/frame/opaque_browser_frame_view.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698