| 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();
|
|
|