Take out the activex control.

webkit/glue/plugins/plugin_list.cc

 // 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.
 
 #include "webkit/glue/plugins/plugin_list.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "net/base/mime_util.h"
 #include "webkit/default_plugin/plugin_main.h"
+#include "webkit/glue/plugins/plugin_constants_win.h"
 #include "webkit/glue/plugins/plugin_lib.h"
 #include "webkit/glue/webkit_glue.h"
 #include "googleurl/src/gurl.h"
 
-#if defined(OS_WIN)
-#include "webkit/activex_shim/activex_shared.h"
-#include "webkit/glue/plugins/plugin_constants_win.h"
-#endif
-
 namespace NPAPI {
 
 base::LazyInstance<PluginList> g_singleton(base::LINKER_INITIALIZED);
 
 // static
 PluginList* PluginList::Singleton() {
   return g_singleton.Pointer();
 }
 
 bool PluginList::PluginsLoaded() {
@@ skipping 133 matching lines @@
     LoadPlugin(extra_plugin_paths[i], &new_plugins);
 
   for (size_t i = 0; i < extra_plugin_dirs.size(); ++i) {
     LoadPluginsFromDir(extra_plugin_dirs[i], &new_plugins);
   }
 
   for (size_t i = 0; i < directories_to_scan.size(); ++i) {
     LoadPluginsFromDir(directories_to_scan[i], &new_plugins);
   }
 
-  LoadInternalPlugins(&new_plugins);
-
   if (webkit_glue::IsDefaultPluginEnabled())
     LoadPlugin(FilePath(kDefaultPluginLibraryName), &new_plugins);
 
   base::TimeTicks end_time = base::TimeTicks::Now();
   base::TimeDelta elapsed = end_time - start_time;
   DLOG(INFO) << "Loaded plugin list in " << elapsed.InMilliseconds() << " ms.";
 
   AutoLock lock(lock_);
   plugins_ = new_plugins;
   plugins_loaded_ = true;
@@ skipping 22 matching lines @@
       const std::string &mime_type = plugin_info.mime_types[i].mime_type;
       if (mime_type == "*" )
         return;
     }
   }
 
   plugins->push_back(plugin_info);
 }
 
 bool PluginList::FindPlugin(const std::string& mime_type,
-                            const std::string& clsid,
                             bool allow_wildcard,
                             WebPluginInfo* info) {
   DCHECK(mime_type == StringToLowerASCII(mime_type));
 
   LoadPlugins(false);
   AutoLock lock(lock_);
   for (size_t i = 0; i < plugins_.size(); ++i) {
     if (SupportsType(plugins_[i], mime_type, allow_wildcard)) {
-#if defined(OS_WIN)
-      if (!clsid.empty() && plugins_[i].path.value() == kActiveXShimFileName) {
-        // Special handling for ActiveX shim. If ActiveX is not installed, we
-        // should use the default plugin to show the installation UI.
-        if (!activex_shim::IsActiveXInstalled(clsid))
-          continue;
-      }
-#endif
       *info = plugins_[i];
       return true;
     }
   }
 
   return false;
 }
 
-bool PluginList::FindPlugin(const GURL &url, std::string* actual_mime_type,
+bool PluginList::FindPlugin(const GURL &url,
+                            std::string* actual_mime_type,
                             WebPluginInfo* info) {
   LoadPlugins(false);
   AutoLock lock(lock_);
   std::string path = url.path();
   std::string::size_type last_dot = path.rfind('.');
   if (last_dot == std::string::npos)
     return false;
 
   std::string extension = StringToLowerASCII(std::string(path, last_dot+1));
 
@@ skipping 46 matching lines @@
 
 void PluginList::GetPlugins(bool refresh, std::vector<WebPluginInfo>* plugins) {
   LoadPlugins(refresh);
 
   AutoLock lock(lock_);
   *plugins = plugins_;
 }
 
 bool PluginList::GetPluginInfo(const GURL& url,
                                const std::string& mime_type,
-                               const std::string& clsid,
                                bool allow_wildcard,
                                WebPluginInfo* info,
                                std::string* actual_mime_type) {
-  bool found = FindPlugin(mime_type,
-                          clsid,
-                          allow_wildcard, info);
-  if (!found
-      || (info->path.value() == kDefaultPluginLibraryName
-#if defined(OS_WIN)
-                                                          && clsid.empty()
-#endif
-                                                                          )) {
+  bool found = FindPlugin(mime_type, allow_wildcard, info);
+  if (!found || (info->path.value() == kDefaultPluginLibraryName)) {
     WebPluginInfo info2;
     if (FindPlugin(url, actual_mime_type, &info2)) {
       found = true;
       *info = info2;
     }
   }
 
   return found;
 }
 
 bool PluginList::GetPluginInfoByPath(const FilePath& plugin_path,
                                      WebPluginInfo* info) {
   LoadPlugins(false);
   AutoLock lock(lock_);
   for (size_t i = 0; i < plugins_.size(); ++i) {
     if (plugins_[i].path == plugin_path) {
       *info = plugins_[i];
       return true;
     }
   }
 
   return false;
 }
 
 void PluginList::Shutdown() {
   // TODO
 }
 
 } // namespace NPAPI