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

Unified Diff: chrome/browser/ui/webui/chrome_web_ui_factory.cc

Issue 7038028: Initial support for cloudprint in print preview (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix bad merge Created 9 years, 7 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
Index: chrome/browser/ui/webui/chrome_web_ui_factory.cc
diff --git a/chrome/browser/ui/webui/chrome_web_ui_factory.cc b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
index 71931fa327f22e02321d9aedf49a32bbfd5f4943..e20d80bb5c74d987ed1ffc3bb5d753e0ef54bf71 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
@@ -200,11 +200,12 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
#else
if (url.host() == chrome::kChromeUISettingsHost)
return &NewWebUI<OptionsUI>;
+#endif // defined(OS_CHROMEOS)
+
if (url.host() == chrome::kChromeUIPrintHost &&
switches::IsPrintPreviewEnabled()) {
return &NewWebUI<PrintPreviewUI>;
}
-#endif // defined(OS_CHROMEOS)
#if defined(TOUCH_UI) && defined(OS_CHROMEOS)
if (url.host() == chrome::kChromeUILoginHost)

Powered by Google App Engine
This is Rietveld 408576698