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

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: Resolved new conflictswq Created 9 years, 5 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 8991b19947f0e690b986ec27df3a86a7ba2951d0..6925e96efcf15b2af3d2db2162ea529feb7dd60e 100644
--- a/chrome/browser/ui/webui/chrome_web_ui_factory.cc
+++ b/chrome/browser/ui/webui/chrome_web_ui_factory.cc
@@ -218,12 +218,12 @@ static WebUIFactoryFunction GetWebUIFactoryFunction(Profile* profile,
return &NewWebUI<SystemInfoUI>;
if (url.host() == chrome::kChromeUIEnterpriseEnrollmentHost)
return &NewWebUI<chromeos::EnterpriseEnrollmentUI>;
-#else
+#endif // defined(OS_CHROMEOS)
+
if (url.host() == chrome::kChromeUIPrintHost &&
switches::IsPrintPreviewEnabled()) {
return &NewWebUI<PrintPreviewUI>;
}
-#endif // defined(OS_CHROMEOS)
if (url.spec() == chrome::kChromeUIConstrainedHTMLTestURL)
return &NewWebUI<ConstrainedHtmlUI>;
« no previous file with comments | « chrome/browser/resources/print_preview/print_preview_cloud.js ('k') | chrome/browser/ui/webui/print_preview_data_source.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698