chrome/renderer/chrome_content_renderer_client.h - Issue 61643022: Proxy private UMA pepper interface for out-of-process and NaCl plugins.

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/chrome_content_renderer_client.h

Issue 61643022: Proxy private UMA pepper interface for out-of-process and NaCl plugins. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressing feedback Created 7 years 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/chrome_renderer.gypi ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/renderer/chrome_content_renderer_client.h

diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h

index 872e2e2deb35bd3095e07b63db789750d40c5eef..11cf0dc568f9159c9dbda6d595b9950ca88cef4e 100644

--- a/chrome/renderer/chrome_content_renderer_client.h

+++ b/chrome/renderer/chrome_content_renderer_client.h

@@ -5,13 +5,10 @@

#ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_

#define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_

+#include <set>

#include <string>

#include <vector>

-#if defined(ENABLE_PLUGINS)

-#include <set>

-#endif

#include "base/compiler_specific.h"

#include "base/memory/scoped_ptr.h"

#include "base/strings/string16.h"

@@ -162,6 +159,9 @@ class ChromeContentRendererClient : public content::ContentRendererClient {

const blink::WebPluginParams& params,

const ChromeViewHostMsg_GetPluginInfo_Output& output);

+ static bool IsExtensionOrSharedModuleWhitelisted(

+ const GURL& url, const std::set<std::string>& whitelist);

// TODO(mpcomplete): remove after we collect histogram data.

// http://crbug.com/100411

static bool IsAdblockInstalled();