diff options
| -rw-r--r-- | chrome/chrome.gyp | 16 | ||||
| -rw-r--r-- | chrome/service/cloud_print/print_system_dummy.cc | 3 |
2 files changed, 5 insertions, 14 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 57d1e8d..17c3eb6 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1079,7 +1079,6 @@ 'service/cloud_print/connector_settings.h', 'service/cloud_print/job_status_updater.cc', 'service/cloud_print/job_status_updater.h', - 'service/cloud_print/print_system_dummy.cc', 'service/cloud_print/print_system.cc', 'service/cloud_print/print_system.h', 'service/cloud_print/printer_job_handler.cc', @@ -1094,11 +1093,6 @@ ], 'conditions': [ ['OS=="win"', { - 'defines': [ - # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation - # of cloud print system, and allows to use custom implementaiton. - 'CP_PRINT_SYSTEM_AVAILABLE', - ], 'sources': [ 'service/cloud_print/print_system_win.cc', ], @@ -1112,15 +1106,15 @@ 'dependencies': [ '../printing/printing.gyp:cups', ], - 'defines': [ - # CP_PRINT_SYSTEM_AVAILABLE disables default dummy implementation - # of cloud print system, and allows to use custom implementaiton. - 'CP_PRINT_SYSTEM_AVAILABLE', - ], 'sources': [ 'service/cloud_print/print_system_cups.cc', ], }], + ['OS!="win" and use_cups!=1', { + 'sources': [ + 'service/cloud_print/print_system_dummy.cc', + ], + }], ], }, ], diff --git a/chrome/service/cloud_print/print_system_dummy.cc b/chrome/service/cloud_print/print_system_dummy.cc index c7a3b50..69f1089 100644 --- a/chrome/service/cloud_print/print_system_dummy.cc +++ b/chrome/service/cloud_print/print_system_dummy.cc @@ -4,7 +4,6 @@ // This is dummy implementation for all configurations where print system // for cloud print is not available. -#if !defined(CP_PRINT_SYSTEM_AVAILABLE) #include "chrome/service/cloud_print/print_system.h" @@ -19,5 +18,3 @@ scoped_refptr<PrintSystem> PrintSystem::CreateInstance( } } // namespace cloud_print -#endif // CP_PRINT_SYSTEM_AVAILABLE - |