NaCl-Chrome integration

webkit/glue/plugins/plugin_list_linux.cc

 // Copyright (c) 2009 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/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
@@ skipping 147 matching lines @@
   // Sort the file list by time (and filename).
   std::sort(files.begin(), files.end(), CompareTime);
 
   // Load the files in order.
   for (FileTimeList::const_iterator i = files.begin(); i != files.end(); ++i) {
     LoadPlugin(i->first, plugins);
   }
 }
 
 
-bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
-                                  std::vector<WebPluginInfo>* plugins) {
+bool PluginList::PlatformShouldLoadPlugin(const WebPluginInfo& info,
+                                          std::vector<WebPluginInfo>* plugins) {
   if (DebugPluginLoading()) {
     LOG(ERROR) << "Considering " << info.path.value()
               << " (" << info.name << ")";
   }
   if (IsUndesirablePlugin(info)) {
     if (DebugPluginLoading())
       LOG(ERROR) << info.path.value() << " is undesirable.";
 
     // See if we have a better version of this plugin.
     for (size_t i = 0; i < plugins->size(); ++i) {
@@ skipping 12 matching lines @@
 
   // TODO(evanm): prefer the newest version of flash, etc. here?
 
   if (DebugPluginLoading())
     LOG(ERROR) << "Using " << info.path.value();
 
   return true;
 }
 
 } // namespace NPAPI