chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc - Issue 2458833005: Move printing defines to buildflag system.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc

Issue 2458833005: Move printing defines to buildflag system. (Closed)

Patch Set: Merge Created 4 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

« no previous file with comments | « chrome/browser/extensions/api/chrome_extensions_api_client.cc ('k') | chrome/browser/extensions/component_extensions_whitelist/whitelist.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc

diff --git a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc

index 9ee429c85620b883ac826f1f4c09f815e17dadf3..a3b40642e23d37dd18909bec20aa073d97f80d38 100644

--- a/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc

+++ b/chrome/browser/extensions/api/cloud_print_private/cloud_print_private_api.cc

@@ -13,12 +13,13 @@

#include "chrome/common/extensions/api/cloud_print_private.h"

#include "google_apis/google_api_keys.h"

#include "net/base/network_interfaces.h"

+#include "printing/features/features.h"

namespace extensions {

namespace {

-#if defined(ENABLE_PRINT_PREVIEW)

+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)

const char kErrorIncognito[] = "Cannot access in incognito mode";

#endif

@@ -47,7 +48,7 @@ CloudPrintPrivateSetupConnectorFunction::

}

bool CloudPrintPrivateSetupConnectorFunction::RunAsync() {

-#if defined(ENABLE_PRINT_PREVIEW)

+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)

using api::cloud_print_private::SetupConnector::Params;

std::unique_ptr<Params> params(Params::Create(*args_));

if (CloudPrintTestsDelegate::Get()) {

@@ -101,7 +102,7 @@ void CloudPrintPrivateGetPrintersFunction::SendResults(

}

bool CloudPrintPrivateGetPrintersFunction::RunAsync() {

-#if defined(ENABLE_PRINT_PREVIEW)

+#if BUILDFLAG(ENABLE_PRINT_PREVIEW)

if (CloudPrintTestsDelegate::Get()) {

SendResults(CloudPrintTestsDelegate::Get()->GetPrinters());

} else {