diff options
| author | rharrison@chromium.org <rharrison@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 07:58:31 +0000 |
|---|---|---|
| committer | rharrison@chromium.org <rharrison@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 07:58:31 +0000 |
| commit | af1c080b4ef5c86ec4243771ac1ac2da97745298 (patch) | |
| tree | 23e50f4c8f2afc39937e78f306c446e1f5754a2f /content | |
| parent | 21e0cbf6bf480671aef2b3e07502bf665627f4ab (diff) | |
| download | chromium_src-af1c080b4ef5c86ec4243771ac1ac2da97745298.zip chromium_src-af1c080b4ef5c86ec4243771ac1ac2da97745298.tar.gz chromium_src-af1c080b4ef5c86ec4243771ac1ac2da97745298.tar.bz2 | |
This is the first CL for a sequence of CLs that will add in the display infrastructure that I have built for the DOM Login and touch keyboard. If have created a reference CL for what the end product of this sequence is intended to be, so that I can give context for the CL under review.This can be found at: http://codereview.chromium.org/6577003/
This CL adds in chrome://login-container to touchui==1 and chromeos==1 builds. This page is hooked into the WebUI to enable testing and development of a Browser based container for the DOM Login screens. In this CL all it does it
create a Browser with chrome://login in it. This functionality will be extended in following CLs.
Patch from Ryan Harrison <rharrison@chromium.org>
BUG=none
TEST=manual
Review URL: http://codereview.chromium.org/6579003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76894 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/webui/web_ui_factory.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/content/browser/webui/web_ui_factory.cc b/content/browser/webui/web_ui_factory.cc index c8ae401..e278fef 100644 --- a/content/browser/webui/web_ui_factory.cc +++ b/content/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) |