Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / renderer / chrome_content_renderer_client.h

diff --git a/src/chrome/renderer/chrome_content_renderer_client.h b/src/chrome/renderer/chrome_content_renderer_client.h
index 7fe7a82..32bf76f 100644 (file)
--- a/src/chrome/renderer/chrome_content_renderer_client.h
+++ b/src/chrome/renderer/chrome_content_renderer_client.h
@@ -115,8 +115,6 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
   virtual bool ShouldOverridePageVisibilityState(
       const content::RenderFrame* render_frame,
       blink::WebPageVisibilityState* override_state) OVERRIDE;
-  virtual bool AllowBrowserPlugin(
-      blink::WebPluginContainer* container) OVERRIDE;
   virtual const void* CreatePPAPIInterface(
       const std::string& interface_name) OVERRIDE;
   virtual bool IsExternalPepperPlugin(const std::string& module_name) OVERRIDE;
@@ -131,6 +129,9 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
   virtual bool AllowPepperMediaStreamAPI(const GURL& url) OVERRIDE;
   virtual void AddKeySystems(
       std::vector<content::KeySystemInfo>* key_systems) OVERRIDE;
+  virtual bool IsPluginAllowedToUseDevChannelAPIs() OVERRIDE;
+  virtual bool IsPluginAllowedToUseCompositorAPI(const GURL& url) OVERRIDE;
+  virtual bool IsPluginAllowedToUseVideoDecodeAPI(const GURL& url) OVERRIDE;
 
   // Takes ownership.
   void SetExtensionDispatcherForTest(
@@ -152,13 +153,7 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
   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();
-  static bool IsAdblockPlusInstalled();
-  static bool IsAdblockWithWebRequestInstalled();
-  static bool IsAdblockPlusWithWebRequestInstalled();
-  static bool IsOtherExtensionWithWebRequestInstalled();
+  static bool WasWebRequestUsedBySomeExtensions();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction);
@@ -206,6 +201,10 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
   scoped_refptr<WebRtcLoggingMessageFilter> webrtc_logging_message_filter_;
 #endif
   scoped_ptr<SearchBouncer> search_bouncer_;
+#if defined(ENABLE_PLUGINS)
+  std::set<std::string> allowed_compositor_origins_;
+  std::set<std::string> allowed_video_decode_origins_;
+#endif
 };
 
 #endif  // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_