diff options
| author | scottbyer@google.com <scottbyer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 18:16:44 +0000 |
|---|---|---|
| committer | scottbyer@google.com <scottbyer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-29 18:16:44 +0000 |
| commit | 0dc2a814add97c39e5fcd99b31bfeae028fdead0 (patch) | |
| tree | 2e7c869798e2a6eb7a82c2e712259c166ec384ca /printing/backend | |
| parent | 0e92b5fa4d9837066b9c8ae6d36e9ec32174f3cf (diff) | |
| download | chromium_src-0dc2a814add97c39e5fcd99b31bfeae028fdead0.zip chromium_src-0dc2a814add97c39e5fcd99b31bfeae028fdead0.tar.gz chromium_src-0dc2a814add97c39e5fcd99b31bfeae028fdead0.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64454 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/backend')
| -rw-r--r-- | printing/backend/print_backend_cups.cc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc index 09fdf1d..9693299 100644 --- a/printing/backend/print_backend_cups.cc +++ b/printing/backend/print_backend_cups.cc @@ -6,9 +6,7 @@ #include <dlfcn.h> #include <errno.h> -#if !defined(OS_MACOSX) #include <gcrypt.h> -#endif #include <pthread.h> #include "base/file_util.h" @@ -20,7 +18,6 @@ #include "googleurl/src/gurl.h" #include "printing/backend/cups_helper.h" -#if !defined(OS_MACOSX) GCRY_THREAD_OPTION_PTHREAD_IMPL; namespace { @@ -67,7 +64,6 @@ class GcryptInitializer { }; } // namespace -#endif namespace printing { @@ -186,10 +182,8 @@ 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) { |