diff options
| author | scottbyer@google.com <scottbyer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 20:30:38 +0000 |
|---|---|---|
| committer | scottbyer@google.com <scottbyer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 20:30:38 +0000 |
| commit | 6df3ebfbab4615970e363ad194ad279b5bdd1336 (patch) | |
| tree | 7ff1f4cec7b7f3a00323db2be47f088d1f334e45 /printing/backend/print_backend_cups.cc | |
| parent | 366a883e1ad04b5cf8a7088644560ab86f5f1f0d (diff) | |
| download | chromium_src-6df3ebfbab4615970e363ad194ad279b5bdd1336.zip chromium_src-6df3ebfbab4615970e363ad194ad279b5bdd1336.tar.gz chromium_src-6df3ebfbab4615970e363ad194ad279b5bdd1336.tar.bz2 | |
Revert 64454 - Revert 64441 - Mac cloud print proxy work.
Turn on use_cups for the Mac, add in the required library, and tweak the code
to get it linking. There is still more work to do; this is just a gyp-oriented
change to get things started.
BUG=none
TEST=All targets still build on all platforms.
Review URL: http://codereview.chromium.org/4167006
TBR=scottbyer@chromium.org
Review URL: http://codereview.chromium.org/4136011
TBR=scottbyer@google.com
Review URL: http://codereview.chromium.org/4137013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64477 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/backend/print_backend_cups.cc')
| -rw-r--r-- | printing/backend/print_backend_cups.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc index 9693299..09fdf1d 100644 --- a/printing/backend/print_backend_cups.cc +++ b/printing/backend/print_backend_cups.cc @@ -6,7 +6,9 @@ #include <dlfcn.h> #include <errno.h> +#if !defined(OS_MACOSX) #include <gcrypt.h> +#endif #include <pthread.h> #include "base/file_util.h" @@ -18,6 +20,7 @@ #include "googleurl/src/gurl.h" #include "printing/backend/cups_helper.h" +#if !defined(OS_MACOSX) GCRY_THREAD_OPTION_PTHREAD_IMPL; namespace { @@ -64,6 +67,7 @@ class GcryptInitializer { }; } // namespace +#endif namespace printing { @@ -182,8 +186,10 @@ bool PrintBackendCUPS::IsValidPrinter(const std::string& printer_name) { scoped_refptr<PrintBackend> PrintBackend::CreateInstance( const DictionaryValue* print_backend_settings) { +#if !defined(OS_MACOSX) // Initialize gcrypt library. Singleton<GcryptInitializer>::get(); +#endif std::string print_server_url_str; if (print_backend_settings) { |