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

Unified Diff: printing/backend/print_backend_chromeos.cc

Issue 1934013002: Enable the cups backend when --enable-native-cups is specified. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cupsFlag
Patch Set: Unbreak other platforms Created 4 years, 6 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: printing/backend/print_backend_chromeos.cc
diff --git a/printing/backend/print_backend_chromeos.cc b/printing/backend/print_backend_chromeos.cc
index f32bbe1e865cd28656aaa9bc65550af4c7f0a173..9f11ec26a5b258686d1215c689cc223bd6af68e8 100644
--- a/printing/backend/print_backend_chromeos.cc
+++ b/printing/backend/print_backend_chromeos.cc
@@ -5,6 +5,12 @@
#include "printing/backend/print_backend.h"
#include "base/logging.h"
+#include "base/values.h"
+#include "printing/backend/print_backend_consts.h"
+#if defined(USE_CUPS)
Lei Zhang 2016/06/28 22:27:35 #includes inside an #if goes in their own section
skau 2016/06/28 23:58:19 Done.
+#include "printing/backend/print_backend_cups.h"
+#endif // defined(USE_CUPS)
+#include "url/gurl.h"
namespace printing {
@@ -72,8 +78,27 @@ bool PrintBackendChromeOS::IsValidPrinter(const std::string& printer_name) {
scoped_refptr<PrintBackend> PrintBackend::CreateInstance(
const base::DictionaryValue* print_backend_settings) {
+ if (PrintBackend::native_cups_enabled) {
+#if defined(USE_CUPS)
+ std::string print_server_url_str;
+ std::string cups_blocking;
+ int encryption = HTTP_ENCRYPT_NEVER;
+ if (print_backend_settings) {
+ print_backend_settings->GetString(kCUPSPrintServerURL,
+ &print_server_url_str);
+
+ print_backend_settings->GetString(kCUPSBlocking, &cups_blocking);
+
+ print_backend_settings->GetInteger(kCUPSEncryption, &encryption);
+ }
+ GURL print_server_url(print_server_url_str.c_str());
+ return new PrintBackendCUPS(print_server_url,
+ static_cast<http_encryption_t>(encryption),
+ cups_blocking == kValueTrue);
+#endif // defined(USE_CUPS)
+ }
+
return new PrintBackendChromeOS();
}
} // namespace printing
-

Powered by Google App Engine
This is Rietveld 408576698