Take out the activex control.

webkit/glue/plugins/plugin_list.h

 // Copyright (c) 2006-2008 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 WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__
 #define WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__
 
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 100 matching lines @@
   // Get all the plugins
   void GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins);
 
   // Returns true if a plugin is found for the given url and mime type.
   // The mime type which corresponds to the URL is optionally returned
   // back.
   // The allow_wildcard parameter controls whether this function returns
   // plugins which support wildcard mime types (* as the mime type).
   bool GetPluginInfo(const GURL& url,
                      const std::string& mime_type,
-                     const std::string& clsid,
                      bool allow_wildcard,
                      WebPluginInfo* info,
                      std::string* actual_mime_type);
 
   // Get plugin info by plugin path. Returns true if the plugin is found and
   // WebPluginInfo has been filled in |info|.
   bool GetPluginInfoByPath(const FilePath& plugin_path,
                            WebPluginInfo* info);
 
   // Load a specific plugin with full path.
@@ skipping 10 matching lines @@
   // Load all plugins from a specific directory
   void LoadPluginsFromDir(const FilePath& path,
                           std::vector<WebPluginInfo>* plugins);
 
   // Returns true if we should load the given plugin, or false otherwise.
   // plugins is the list of plugins we have crawled in the current plugin
   // loading run.
   bool ShouldLoadPlugin(const WebPluginInfo& info,
                         std::vector<WebPluginInfo>* plugins);
 
-  // Load internal plugins.
-  void LoadInternalPlugins(std::vector<WebPluginInfo>* plugins);
-
-  // Find a plugin by mime type, and clsid.
-  // If clsid is empty, we will just find the plugin that supports mime type.
-  // Otherwise, if mime_type is application/x-oleobject etc that's supported by
-  // by our activex shim, we need to check if the specified ActiveX exists.
-  // If not we will not return the activex shim, instead we will let the
-  // default plugin handle activex installation.
+  // Find a plugin by mime type.
   // The allow_wildcard parameter controls whether this function returns
   // plugins which support wildcard mime types (* as the mime type)
-  bool FindPlugin(const std::string &mime_type, const std::string& clsid,
-                  bool allow_wildcard, WebPluginInfo* info);
+  bool FindPlugin(const std::string &mime_type,
+                  bool allow_wildcard,
+                  WebPluginInfo* info);
 
   // Find a plugin by extension. Returns the corresponding mime type.
-  bool FindPlugin(const GURL &url, std::string* actual_mime_type,
+  bool FindPlugin(const GURL &url,
+                  std::string* actual_mime_type,
                   WebPluginInfo* info);
 
   // Returns true if the given WebPluginInfo supports "mime-type".
   // mime_type should be all lower case.
   static bool SupportsType(const WebPluginInfo& info,
                            const std::string &mime_type,
                            bool allow_wildcard);
 
   // Returns true if the given WebPluginInfo supports a given file extension.
   // extension should be all lower case.
@@ skipping 14 matching lines @@
   // Get the ordered list of directories from which to load plugins
   void GetPluginDirectories(std::vector<FilePath>* plugin_dirs);
 
   //
   // Command-line switches
   //
 
 #if defined(OS_WIN)
   // true if we shouldn't load the new WMP plugin.
   bool dont_load_new_wmp_;
-
-  // true if we should use our internal ActiveX shim
-  bool use_internal_activex_shim_;
 #endif
 
   //
   // Internals
   //
 
   bool plugins_loaded_;
 
   // Contains information about the available plugins.
   std::vector<WebPluginInfo> plugins_;
@@ skipping 12 matching lines @@
   Lock lock_;
 
   friend struct base::DefaultLazyInstanceTraits<PluginList>;
 
   DISALLOW_COPY_AND_ASSIGN(PluginList);
 };
 
 } // namespace NPAPI
 
 #endif  // WEBKIT_GLUE_PLUGIN_PLUGIN_LIST_H__