Move webplugininfo.h to content/public.

content/browser/plugin_service_impl.h

 // Copyright (c) 2012 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.
 
 // This class responds to requests from renderers for the list of plugins, and
 // also a proxy object for plugin instances.
 
 #ifndef CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
 #define CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_
 
@@ skipping 58 matching lines @@
   // Returns the PluginServiceImpl singleton.
   static PluginServiceImpl* GetInstance();
 
   // PluginService implementation:
   virtual void Init() OVERRIDE;
   virtual void StartWatchingPlugins() OVERRIDE;
   virtual bool GetPluginInfoArray(
       const GURL& url,
       const std::string& mime_type,
       bool allow_wildcard,
-      std::vector<webkit::WebPluginInfo>* info,
+      std::vector<WebPluginInfo>* info,
       std::vector<std::string>* actual_mime_types) OVERRIDE;
   virtual bool GetPluginInfo(int render_process_id,
                              int render_view_id,
                              ResourceContext* context,
                              const GURL& url,
                              const GURL& page_url,
                              const std::string& mime_type,
                              bool allow_wildcard,
                              bool* is_stale,
-                             webkit::WebPluginInfo* info,
+                             WebPluginInfo* info,
                              std::string* actual_mime_type) OVERRIDE;
   virtual bool GetPluginInfoByPath(const base::FilePath& plugin_path,
-                                   webkit::WebPluginInfo* info) OVERRIDE;
+                                   WebPluginInfo* info) OVERRIDE;
   virtual string16 GetPluginDisplayNameByPath(
       const base::FilePath& path) OVERRIDE;
   virtual void GetPlugins(const GetPluginsCallback& callback) OVERRIDE;
   virtual PepperPluginInfo* GetRegisteredPpapiPluginInfo(
       const base::FilePath& plugin_path) OVERRIDE;
   virtual void SetFilter(PluginServiceFilter* filter) OVERRIDE;
   virtual PluginServiceFilter* GetFilter() OVERRIDE;
   virtual void ForcePluginShutdown(const base::FilePath& plugin_path) OVERRIDE;
   virtual bool IsPluginUnstable(const base::FilePath& plugin_path) OVERRIDE;
   virtual void RefreshPlugins() OVERRIDE;
   virtual void AddExtraPluginPath(const base::FilePath& path) OVERRIDE;
   virtual void RemoveExtraPluginPath(const base::FilePath& path) OVERRIDE;
   virtual void AddExtraPluginDir(const base::FilePath& path) OVERRIDE;
   virtual void RegisterInternalPlugin(
-      const webkit::WebPluginInfo& info, bool add_at_beginning) OVERRIDE;
+      const WebPluginInfo& info, bool add_at_beginning) OVERRIDE;
   virtual void UnregisterInternalPlugin(const base::FilePath& path) OVERRIDE;
   virtual void GetInternalPlugins(
-      std::vector<webkit::WebPluginInfo>* plugins) OVERRIDE;
+      std::vector<WebPluginInfo>* plugins) OVERRIDE;
   virtual bool NPAPIPluginsSupported() OVERRIDE;
   virtual void DisablePluginsDiscoveryForTesting() OVERRIDE;
 #if defined(OS_MACOSX)
   virtual void AppActivated() OVERRIDE;
 #elif defined(OS_WIN)
   virtual bool GetPluginInfoFromWindow(HWND window,
                                        base::string16* plugin_name,
                                        base::string16* plugin_version) OVERRIDE;
 
   // Returns true iff the given HWND is a plugin.
@@ skipping 63 matching lines @@
   void GetPluginsInternal(base::MessageLoopProxy* target_loop,
                           const GetPluginsCallback& callback);
 
   // Binding directly to GetAllowedPluginForOpenChannelToPlugin() isn't possible
   // because more arity is needed <http://crbug.com/98542>. This just forwards.
   void ForwardGetAllowedPluginForOpenChannelToPlugin(
       const PluginServiceFilterParams& params,
       const GURL& url,
       const std::string& mime_type,
       PluginProcessHost::Client* client,
-      const std::vector<webkit::WebPluginInfo>&);
+      const std::vector<WebPluginInfo>&);
   // Helper so we can do the plugin lookup on the FILE thread.
   void GetAllowedPluginForOpenChannelToPlugin(
       int render_process_id,
       int render_view_id,
       const GURL& url,
       const GURL& page_url,
       const std::string& mime_type,
       PluginProcessHost::Client* client,
       ResourceContext* resource_context);
 
@@ skipping 39 matching lines @@
 
   // Used to detect if a given plug-in is crashing over and over.
   std::map<base::FilePath, std::vector<base::Time> > crash_times_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginServiceImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_PLUGIN_SERVICE_IMPL_H_