Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The main reasons are that it makes content's embedder interfaces harder to change if they're reused by the embedder, and that its makes it confusing for embedder code when there are multiple ways to do the same thing.

BUG=227047
Review URL: https://codereview.chromium.org/13409003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@192649 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 14 insertions, 16 deletions

diff --git a/chrome/renderer/chrome_content_renderer_client.h b/chrome/renderer/chrome_content_renderer_client.h
index 71bae7c..deb767e 100644
--- a/chrome/renderer/chrome_content_renderer_client.h
+++ b/chrome/renderer/chrome_content_renderer_client.h
@@ -115,16 +115,12 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
                                       const GURL& url,
                                       const GURL& first_party_for_cookies,
                                       const std::string& value) OVERRIDE;
-  virtual bool AllowBrowserPlugin(WebKit::WebPluginContainer* container) const
-      OVERRIDE;
-
-  // TODO(mpcomplete): remove after we collect histogram data.
-  // http://crbug.com/100411
-  bool IsAdblockInstalled();
-  bool IsAdblockPlusInstalled();
-  bool IsAdblockWithWebRequestInstalled();
-  bool IsAdblockPlusWithWebRequestInstalled();
-  bool IsOtherExtensionWithWebRequestInstalled();
+  virtual bool AllowBrowserPlugin(
+      WebKit::WebPluginContainer* container) const OVERRIDE;
+  virtual void RegisterPPAPIInterfaceFactories(
+      webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) OVERRIDE;
+  virtual bool IsRequestOSFileHandleAllowedForURL(
+      const GURL& url) const OVERRIDE;
 
   // For testing.
   void SetExtensionDispatcher(extensions::Dispatcher* extension_dispatcher);
@@ -137,17 +133,19 @@ class ChromeContentRendererClient : public content::ContentRendererClient {
   // and start over.
   void OnPurgeMemory();
 
-  virtual void RegisterPPAPIInterfaceFactories(
-      webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) OVERRIDE;
-
-  WebKit::WebPlugin* CreatePlugin(
+  static WebKit::WebPlugin* CreatePlugin(
       content::RenderView* render_view,
       WebKit::WebFrame* frame,
       const WebKit::WebPluginParams& params,
       const ChromeViewHostMsg_GetPluginInfo_Output& output);
 
-  virtual bool IsRequestOSFileHandleAllowedForURL(
-      const GURL& url) const OVERRIDE;
+  // 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();
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction);