Revert r108760 / reland r108744, r108753 w/ fix

content/public/common/content_client.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
 #define CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 11 matching lines @@
 }
 
 namespace base {
 class StringPiece;
 }
 
 namespace sandbox {
 class TargetPolicy;
 }
 
+namespace webkit {
+namespace npapi {
+class PluginList;
+}
+}
+
 namespace content {
 
 class ContentBrowserClient;
 class ContentClient;
 class ContentPluginClient;
 class ContentRendererClient;
 class ContentUtilityClient;
 struct GPUInfo;
 struct PepperPluginInfo;
 
@@ skipping 30 matching lines @@
   // Sets the currently active URL.  Use GURL() to clear the URL.
   virtual void SetActiveURL(const GURL& url) = 0;
 
   // Sets the data on the current gpu.
   virtual void SetGpuInfo(const content::GPUInfo& gpu_info) = 0;
 
   // Gives the embedder a chance to register its own pepper plugins.
   virtual void AddPepperPlugins(
       std::vector<content::PepperPluginInfo>* plugins) = 0;
 
+  // Gives the embedder a chance to register its own internal NPAPI plugins.
+  virtual void AddNPAPIPlugins(
+      webkit::npapi::PluginList* plugin_list) = 0;
+
   // Returns whether the given message should be allowed to be sent from a
   // swapped out renderer.
   virtual bool CanSendWhileSwappedOut(const IPC::Message* msg) = 0;
 
   // Returns whether the given message should be processed in the browser on
   // behalf of a swapped out renderer.
   virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) = 0;
 
   // Returns the user agent and a flag indicating whether the returned
   // string should always be used (if false, callers may override the
@@ skipping 19 matching lines @@
   ContentPluginClient* plugin_;
   // The embedder API for participating in renderer logic.
   ContentRendererClient* renderer_;
   // The embedder API for participating in utility logic.
   ContentUtilityClient* utility_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_COMMON_CONTENT_CLIENT_H_