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

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: 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.h
diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
index 71e07c54c466e6a0619900aa666a29ffed4cb8a2..d31e1c3d6f12a1a72456cbc91fd658bf7c68f5a6 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"
@@ -155,6 +152,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();

Powered by Google App Engine
This is Rietveld 408576698