linux: search Chrome-specific plugin directories before Mozilla

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 32 matching lines @@
 }
 
 }  // anonymous namespace
 
 namespace NPAPI {
 
 void PluginList::PlatformInit() {
 }
 
 void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
+  // See http://groups.google.com/group/chromium-dev/browse_thread/thread/7a70e5fcbac786a9
+  // for discussion.
+  // We first consult Chrome-specific dirs, then fall back on the logic
+  // Mozilla uses.
+
+  // TODO(evanm): maybe consult our own plugins dir, like
+  // ~/.config/chromium/Plugins?
+
+  // The Chrome binary dir + "plugins/".
+  FilePath dir;
+  PathService::Get(base::DIR_EXE, &dir);
+  plugin_dirs->push_back(dir.Append("plugins"));
+
   // Mozilla code to reference:
   // http://mxr.mozilla.org/firefox/ident?i=NS_APP_PLUGINS_DIR_LIST
   // and tens of accompanying files (mxr is very helpful).
   // This code carefully matches their behavior for compat reasons.
 
   // 1) MOZ_PLUGIN_PATH env variable.
   const char* moz_plugin_path = getenv("MOZ_PLUGIN_PATH");
   if (moz_plugin_path) {
     std::vector<std::string> paths;
     SplitString(moz_plugin_path, ':', &paths);
     for (size_t i = 0; i < paths.size(); ++i)
       plugin_dirs->push_back(FilePath(paths[i]));
   }
 
   // 2) NS_USER_PLUGINS_DIR: ~/.mozilla/plugins.
   // This is a de-facto standard, so even though we're not Mozilla, let's
   // look in there too.
   const char* home = getenv("HOME");
   if (home)
     plugin_dirs->push_back(FilePath(home).Append(".mozilla/plugins"));
-  // TODO(evanm): maybe consult our own plugins dir, like
-  // ~/.config/chromium/Plugins?
 
-  // 3) NS_APP_PLUGINS_DIR: the binary dir + "plugins/".
-  FilePath dir;
-  PathService::Get(base::DIR_EXE, &dir);
-  plugin_dirs->push_back(dir.Append("plugins"));
-
-  // 4) NS_SYSTEM_PLUGINS_DIR:
+  // 3) NS_SYSTEM_PLUGINS_DIR:
   // This varies across different versions of Firefox, so check 'em all.
   plugin_dirs->push_back(FilePath("/usr/lib/mozilla/plugins"));
   plugin_dirs->push_back(FilePath("/usr/lib/firefox/plugins"));
   plugin_dirs->push_back(FilePath("/usr/lib/xulrunner-addons/plugins"));
 }
 
 void PluginList::LoadPluginsFromDir(const FilePath& path,
                                     std::vector<WebPluginInfo>* plugins) {
   // See ScanPluginsDirectory near
   // http://mxr.mozilla.org/firefox/source/modules/plugin/base/src/nsPluginHostImpl.cpp#5052
@@ skipping 78 matching lines @@
 
   // TODO(evanm): prefer the newest version of flash, etc. here?
 
   if (DebugPluginLoading())
     LOG(INFO) << "Using " << info.path.value();
 
   return true;
 }
 
 } // namespace NPAPI