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

Unified Diff: chrome/app/chrome_main_delegate.cc

Issue 22577010: Printing: Add a basic printing mode without print preview and cloud print. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years, 4 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/app/chrome_main_delegate.cc
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index 4825c3f4bf96ed3a3444b2f5464c8e24cf67197a..75505560faa7b1d7a4f4d72f90e523569948f2f1 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -739,10 +739,13 @@ int ChromeMainDelegate::RunProcess(
const content::MainFunctionParams& main_function_params) {
// ANDROID doesn't support "service", so no ServiceProcessMain, and arraysize
// doesn't support empty array. So we comment out the block for Android.
-#if !defined(OS_ANDROID) && \
+#if !defined(ANDROID) && \
cimamoglu1 2013/08/11 18:22:51 Why ANDROID but not OS_ANDROID?
Lei Zhang 2013/08/12 06:06:15 Typo, fixed.
(!defined(CHROME_MULTIPLE_DLL) || defined(CHROME_MULTIPLE_DLL_BROWSER))
static const MainFunction kMainFunctions[] = {
+#if defined(ENABLE_FULL_PRINTING)
{ switches::kServiceProcess, ServiceProcessMain },
+#endif
+
#if defined(OS_MACOSX)
{ switches::kRelauncherProcess,
mac_relauncher::internal::RelauncherMain },

Powered by Google App Engine
This is Rietveld 408576698