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

Unified Diff: chrome/browser/local_discovery/privet_http_impl.cc

Issue 702603004: Renamed DISABLE_BASIC_PRINTING and ENABLE_FULL_PRINTING. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Wed Nov 5 02:31:54 PST 2014 Created 6 years, 1 month 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: chrome/browser/local_discovery/privet_http_impl.cc
diff --git a/chrome/browser/local_discovery/privet_http_impl.cc b/chrome/browser/local_discovery/privet_http_impl.cc
index 5f90ba7de017bb7a153c2d2dc29abd27cd4541be..68fa5a07896e4e0821cbbbc07c0965cf3dbec4e6 100644
--- a/chrome/browser/local_discovery/privet_http_impl.cc
+++ b/chrome/browser/local_discovery/privet_http_impl.cc
@@ -21,9 +21,9 @@
#include "ui/gfx/text_elider.h"
#include "url/gurl.h"
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
#include "chrome/browser/local_discovery/pwg_raster_converter.h"
-#endif // ENABLE_FULL_PRINTING
+#endif // ENABLE_PRINT_PREVIEW
using namespace cloud_devices::printer;
@@ -40,7 +40,7 @@ const char kPrivetRegisterUserArgName[] = "user";
const int kPrivetCancelationTimeoutSeconds = 3;
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
const char kPrivetURLKeyUserName[] = "user_name";
const char kPrivetURLKeyClientName[] = "client_name";
const char kPrivetURLKeyJobname[] = "job_name";
@@ -58,7 +58,7 @@ const int kPrivetLocalPrintMaxRetries = 2;
const int kPrivetLocalPrintDefaultTimeout = 5;
const size_t kPrivetLocalPrintMaxJobNameLength = 64;
-#endif // ENABLE_FULL_PRINTING
+#endif // ENABLE_PRINT_PREVIEW
GURL CreatePrivetURL(const std::string& path) {
GURL url(kUrlPlaceHolder);
@@ -465,7 +465,7 @@ bool PrivetDataReadOperationImpl::OnRawData(PrivetURLFetcher* fetcher,
return true;
}
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
PrivetLocalPrintOperationImpl::PrivetLocalPrintOperationImpl(
PrivetHTTPClient* privet_client,
PrivetLocalPrintOperation::Delegate* delegate)
@@ -825,7 +825,7 @@ void PrivetLocalPrintOperationImpl::SetPWGRasterConverterForTesting(
scoped_ptr<PWGRasterConverter> pwg_raster_converter) {
pwg_raster_converter_ = pwg_raster_converter.Pass();
}
-#endif // ENABLE_FULL_PRINTING
+#endif // ENABLE_PRINT_PREVIEW
PrivetHTTPClientImpl::PrivetHTTPClientImpl(
const std::string& name,
@@ -928,12 +928,12 @@ PrivetV1HTTPClientImpl::CreateCapabilitiesOperation(
scoped_ptr<PrivetLocalPrintOperation>
PrivetV1HTTPClientImpl::CreateLocalPrintOperation(
PrivetLocalPrintOperation::Delegate* delegate) {
-#if defined(ENABLE_FULL_PRINTING)
+#if defined(ENABLE_PRINT_PREVIEW)
return scoped_ptr<PrivetLocalPrintOperation>(
new PrivetLocalPrintOperationImpl(info_client(), delegate));
#else
return scoped_ptr<PrivetLocalPrintOperation>();
-#endif // ENABLE_FULL_PRINTING
+#endif // ENABLE_PRINT_PREVIEW
}
} // namespace local_discovery

Powered by Google App Engine
This is Rietveld 408576698