content/browser/plugin_service_impl.h - Issue 645203002: Block NPAPI plugins by default

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: content/browser/plugin_service_impl.h

Issue 645203002: Block NPAPI plugins by default (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: move UMA outside ifdef Created 5 years, 11 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:

Index: content/browser/plugin_service_impl.h

diff --git a/content/browser/plugin_service_impl.h b/content/browser/plugin_service_impl.h

index 8770974a9734188fc5814fb6b321f1bbc639d661..6b25ed4be6437b08564e7311f05001fcccf27aca 100644

--- a/content/browser/plugin_service_impl.h

+++ b/content/browser/plugin_service_impl.h

@@ -106,6 +106,7 @@ class CONTENT_EXPORT PluginServiceImpl

void UnregisterInternalPlugin(const base::FilePath& path) override;

void GetInternalPlugins(std::vector<WebPluginInfo>* plugins) override;

bool NPAPIPluginsSupported() override;

+ void EnableNpapiPluginsForTesting() override;

void DisablePluginsDiscoveryForTesting() override;

#if defined(OS_MACOSX)

void AppActivated() override;

@@ -226,6 +227,8 @@ class CONTENT_EXPORT PluginServiceImpl

base::win::RegKey hklm_key_;

#endif

+ bool npapi_plugins_enabled_;

#if defined(OS_POSIX) && !defined(OS_OPENBSD) && !defined(OS_ANDROID)

ScopedVector<base::FilePathWatcher> file_watchers_;

#endif

« no previous file with comments | « content/browser/plugin_browsertest.cc ('k') | content/browser/plugin_service_impl.cc » ('j') | no next file with comments »