chrome/browser/android/chrome_jni_registrar.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/android/chrome_jni_registrar.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:

Index: chrome/browser/android/chrome_jni_registrar.cc

diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc

index 7abb0b20ddffe108daf97fae955eed70e8f03c6e..f7e15147e5c78c5d490d72ba90143213fffa1752 100644

--- a/chrome/browser/android/chrome_jni_registrar.cc

+++ b/chrome/browser/android/chrome_jni_registrar.cc

@@ -172,8 +172,9 @@

#include "components/url_formatter/android/component_jni_registrar.h"

#include "components/variations/android/component_jni_registrar.h"

#include "components/web_contents_delegate_android/component_jni_registrar.h"

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

-#if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)

+#if BUILDFLAG(ENABLE_PRINTING) && !BUILDFLAG(ENABLE_PRINT_PREVIEW)

#include "printing/printing_context_android.h"

#endif

@@ -404,7 +405,7 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

{"WebsitePreferenceBridge", RegisterWebsitePreferenceBridge},

{"WebsiteSettingsPopupAndroid",

WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid},

-#if defined(ENABLE_PRINTING) && !defined(ENABLE_PRINT_PREVIEW)

+#if BUILDFLAG(ENABLE_PRINTING) && !BUILDFLAG(ENABLE_PRINT_PREVIEW)

{"PrintingContext",

printing::PrintingContextAndroid::RegisterPrintingContext},

#endif

« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/apps/app_browsertest.cc » ('j') | no next file with comments »