chrome/browser/extensions/component_extensions_whitelist/whitelist.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/component_extensions_whitelist/whitelist.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/cloud_print_private/cloud_print_private_api.cc ('k') | chrome/browser/extensions/component_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

diff --git a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

index 08d33cd14e67638061dce49deb5989f0eafaf493..d540b5feb604f087a39dc87d669a465523185c43 100644

--- a/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

+++ b/chrome/browser/extensions/component_extensions_whitelist/whitelist.cc

@@ -13,6 +13,7 @@

#include "chrome/common/features.h"

#include "chrome/grit/browser_resources.h"

#include "extensions/common/constants.h"

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

#if BUILDFLAG(ENABLE_APP_LIST) && defined(OS_CHROMEOS)

#include "chrome/browser/ui/app_list/google_now_extension.h"

@@ -75,7 +76,7 @@ bool IsComponentExtensionWhitelisted(int manifest_resource_id) {

#if BUILDFLAG(ENABLE_APP_LIST)

case IDR_CHROME_APP_MANIFEST:

#endif

-#if defined(ENABLE_PRINTING)

+#if BUILDFLAG(ENABLE_PRINTING)

case IDR_CLOUDPRINT_MANIFEST:

#endif

case IDR_CRYPTOTOKEN_MANIFEST: