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

Side by Side Diff: printing/backend/print_backend_cups.cc

Issue 18919005: Migrate from googleurl/ includes to url/ ones in the remaining top-level directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: make googleurl a temp include rule - to prevent others including it again Created 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « printing/backend/cups_helper.cc ('k') | printing/print_settings_initializer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "printing/backend/print_backend.h" 5 #include "printing/backend/print_backend.h"
6 6
7 #include "build/build_config.h" 7 #include "build/build_config.h"
8 8
9 #include <dlfcn.h> 9 #include <dlfcn.h>
10 #include <errno.h> 10 #include <errno.h>
11 #include <pthread.h> 11 #include <pthread.h>
12 12
13 #if defined(OS_MACOSX) 13 #if defined(OS_MACOSX)
14 #include <AvailabilityMacros.h> 14 #include <AvailabilityMacros.h>
15 #else 15 #else
16 #include <gcrypt.h> 16 #include <gcrypt.h>
17 #endif 17 #endif
18 18
19 #include "base/file_util.h" 19 #include "base/file_util.h"
20 #include "base/lazy_instance.h" 20 #include "base/lazy_instance.h"
21 #include "base/logging.h" 21 #include "base/logging.h"
22 #include "base/strings/string_number_conversions.h" 22 #include "base/strings/string_number_conversions.h"
23 #include "base/synchronization/lock.h" 23 #include "base/synchronization/lock.h"
24 #include "base/values.h" 24 #include "base/values.h"
25 #include "googleurl/src/gurl.h"
26 #include "printing/backend/cups_helper.h" 25 #include "printing/backend/cups_helper.h"
27 #include "printing/backend/print_backend_consts.h" 26 #include "printing/backend/print_backend_consts.h"
27 #include "url/gurl.h"
28 28
29 #if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 4) 29 #if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 4)
30 const int CUPS_PRINTER_SCANNER = 0x2000000; // Scanner-only device 30 const int CUPS_PRINTER_SCANNER = 0x2000000; // Scanner-only device
31 #endif 31 #endif
32 32
33 #if !defined(OS_MACOSX) 33 #if !defined(OS_MACOSX)
34 GCRY_THREAD_OPTION_PTHREAD_IMPL; 34 GCRY_THREAD_OPTION_PTHREAD_IMPL;
35 35
36 namespace { 36 namespace {
37 37
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
370 << ", HTTP error: " << http_error; 370 << ", HTTP error: " << http_error;
371 base::Delete(ppd_path, false); 371 base::Delete(ppd_path, false);
372 ppd_path.clear(); 372 ppd_path.clear();
373 } 373 }
374 } 374 }
375 } 375 }
376 return ppd_path; 376 return ppd_path;
377 } 377 }
378 378
379 } // namespace printing 379 } // namespace printing
OLDNEW
« no previous file with comments | « printing/backend/cups_helper.cc ('k') | printing/print_settings_initializer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698