chrome/common/pref_names.h - Issue 1318143002: Always use ENABLE_PLUGINS to indicate plugins support.

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/common/pref_names.h

Issue 1318143002: Always use ENABLE_PLUGINS to indicate plugins support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: simplify content_browsertests.isolate Created 5 years, 4 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: chrome/common/pref_names.h

diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h

index 21e7b2ea1e2b366bce52e910b9ce84b365e3af92..2ffea8ae53c7bc6f57bb8b44bf6a51c4c6580a54 100644

--- a/chrome/common/pref_names.h

+++ b/chrome/common/pref_names.h

@@ -312,7 +312,7 @@ extern const char kPluginsDisabledPlugins[];

extern const char kPluginsDisabledPluginsExceptions[];

extern const char kPluginsEnabledPlugins[];

extern const char kNpapiFlashMigratedToPepperFlash[];

-#if !defined(OS_ANDROID)

+#if defined(ENABLE_PLUGINS)

extern const char kPluginsShowDetails[];

#endif

extern const char kPluginsAllowOutdated[];

@@ -327,7 +327,7 @@ extern const char kDefaultBrowserSettingEnabled[];

extern const char kShowUpdatePromotionInfoBar[];

#endif

extern const char kUseCustomChromeFrame[];

-#if !defined(OS_ANDROID)

+#if defined(ENABLE_PLUGINS)

extern const char kContentSettingsPluginWhitelist[];

#endif

extern const char kClearSiteDataOnExit[];

« chrome/common/chrome_content_client.cc ('K') | « chrome/common/chrome_content_client.cc ('k') | chrome/common/pref_names.cc » ('j') | no next file with comments »