chrome/renderer/pepper/pepper_uma_host.cc - Issue 559103003: Cleanup: Remove Dispatcher and UserScript classes from builds where extensions are disabled.

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/renderer/pepper/pepper_uma_host.cc

Issue 559103003: Cleanup: Remove Dispatcher and UserScript classes from builds where extensions are disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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

« no previous file with comments | « chrome/renderer/extensions/renderer_permissions_policy_delegate.cc ('k') | chrome/test/base/chrome_render_view_test.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/pepper/pepper_uma_host.cc

diff --git a/chrome/renderer/pepper/pepper_uma_host.cc b/chrome/renderer/pepper/pepper_uma_host.cc

index dbf605bf2bd8eb322bf52f6218193d0041664b27..a679e300bc7235be599afe24511ea2c884beca77 100644

--- a/chrome/renderer/pepper/pepper_uma_host.cc

+++ b/chrome/renderer/pepper/pepper_uma_host.cc

@@ -84,8 +84,12 @@ int32_t PepperUMAHost::OnResourceMessageReceived(

}

bool PepperUMAHost::IsPluginWhitelisted() {

+#if defined(ENABLE_EXTENSIONS)

return ChromeContentRendererClient::IsExtensionOrSharedModuleWhitelisted(

document_url_, allowed_origins_);

+#else

+ return false;

+#endif

}

bool PepperUMAHost::IsHistogramAllowed(const std::string& histogram) {

« no previous file with comments | « chrome/renderer/extensions/renderer_permissions_policy_delegate.cc ('k') | chrome/test/base/chrome_render_view_test.h » ('j') | no next file with comments »