summaryrefslogtreecommitdiffstats
path: root/chrome/common/url_constants.h
diff options
context:
space:
mode:
authorrharrison@chromium.org <rharrison@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 07:58:31 +0000
committerrharrison@chromium.org <rharrison@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 07:58:31 +0000
commitaf1c080b4ef5c86ec4243771ac1ac2da97745298 (patch)
tree23e50f4c8f2afc39937e78f306c446e1f5754a2f /chrome/common/url_constants.h
parent21e0cbf6bf480671aef2b3e07502bf665627f4ab (diff)
downloadchromium_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 'chrome/common/url_constants.h')
-rw-r--r--chrome/common/url_constants.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index cfd8080..563be8a 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -121,7 +121,6 @@ extern const char kChromeUIGpuInternalsHost[];
extern const char kChromeUIHistory2Host[];
extern const char kChromeUIHistoryHost[];
extern const char kChromeUIKeyboardHost[];
-extern const char kChromeUILoginHost[];
extern const char kChromeUINetInternalsHost[];
extern const char kChromeUINewTabHost[];
extern const char kChromeUIPluginsHost[];
@@ -153,6 +152,11 @@ extern const char kChromeUINetworkMenu[];
extern const char kChromeUIUserImageHost[];
#endif
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+extern const char kChromeUILoginContainerHost[];
+extern const char kChromeUILoginHost[];
+#endif
+
// Special URL used to start a navigation to an error page.
extern const char kUnreachableWebDataURL[];