Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5160)

Unified Diff: chrome/renderer/chrome_content_renderer_client.cc

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: remove unused histogram names Created 6 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:
View side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/chrome_content_renderer_client.cc
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 5981a342a3b3a13f687c25d78d6881aa79fee872..f1195b5f20587a0f23404f52f7485705701951cf 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -1317,6 +1317,14 @@ bool ChromeContentRendererClient::IsExternalPepperPlugin(
return module_name == "Native Client";
}
+bool ChromeContentRendererClient::IsExtensionOrSharedModuleWhitelisted(
+ const GURL& url, const std::set<std::string>& whitelist) {
jam 2014/01/18 02:03:05 put these two lines in the one calling method. Chr
elijahtaylor1 2014/01/22 20:15:07 I'm happy to move this code out of here, the reaso
+ const extensions::ExtensionSet* extension_set =
+ g_current_client->extension_dispatcher_->extensions();
+ return chrome::IsExtensionOrSharedModuleWhitelisted(url, extension_set,
+ whitelist);
+}
+
blink::WebSpeechSynthesizer*
ChromeContentRendererClient::OverrideSpeechSynthesizer(
blink::WebSpeechSynthesizerClient* client) {
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.h ('k') | chrome/renderer/pepper/chrome_renderer_pepper_host_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698