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

Unified Diff: chrome/browser/dom_ui/dom_ui_factory.cc

Issue 6017006: touch: Login code necessary only for chromeos. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: avoid nested ifdef's Created 10 years 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/dom_ui/dom_ui_factory.cc
diff --git a/chrome/browser/dom_ui/dom_ui_factory.cc b/chrome/browser/dom_ui/dom_ui_factory.cc
index b1aca947e041da9e33ae61faab0fba74bfe685fb..6f7eaafbed98e2824c6a638e3887de4c6f53eea2 100644
--- a/chrome/browser/dom_ui/dom_ui_factory.cc
+++ b/chrome/browser/dom_ui/dom_ui_factory.cc
@@ -157,8 +157,6 @@ static DOMUIFactoryFunction GetDOMUIFactoryFunction(Profile* profile,
#if defined(TOUCH_UI)
if (url.host() == chrome::kChromeUIKeyboardHost)
return &NewDOMUI<KeyboardUI>;
- if (url.host() == chrome::kChromeUILoginHost)
- return &NewDOMUI<chromeos::LoginUI>;
#endif
if (url.host() == chrome::kChromeUIGpuInternalsHost)
return &NewDOMUI<GpuInternalsUI>;
@@ -213,6 +211,11 @@ static DOMUIFactoryFunction GetDOMUIFactoryFunction(Profile* profile,
return &NewDOMUI<PrintPreviewUI>;
}
}
+#endif // defined(OS_CHROMEOS)
+
+#if defined(OS_CHROMEOS) && defined(TOUCH_UI)
+ if (url.host() == chrome::kChromeUILoginHost)
+ return &NewDOMUI<chromeos::LoginUI>;
#endif
if (url.spec() == chrome::kChromeUIConstrainedHTMLTestURL)
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698