chromeos: Only look for plugins in Chrome's directory.

webkit/glue/plugins/plugin_list_posix.cc

 // Copyright (c) 2010 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/file_util.h"
 #include "base/path_service.h"
 #include "base/sha1.h"
 #include "base/string_util.h"
@@ skipping 103 matching lines @@
 
   // Note: "extra" plugin dirs, including the Plugins subdirectory of
   // your Chrome config, are examined before these.  See the logic
   // related to extra_plugin_dirs in plugin_list.cc.
 
   // The Chrome binary dir + "plugins/".
   FilePath dir;
   PathService::Get(base::DIR_EXE, &dir);
   plugin_dirs->push_back(dir.Append("plugins"));
 
+  // Chrome OS only loads plugins from /opt/google/chrome/plugins.
+#if !defined(OS_CHROMEOS)
   // 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]));
   }
 
-#if !defined(OS_CHROMEOS)
   // 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.
   FilePath home = file_util::GetHomeDir();
   if (!home.empty())
     plugin_dirs->push_back(home.Append(".mozilla/plugins"));
-#endif
 
   // 3) NS_SYSTEM_PLUGINS_DIR:
   // This varies across different browsers and versions, so check 'em all.
   plugin_dirs->push_back(FilePath("/usr/lib/browser-plugins"));
   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"));
 
 #if defined(ARCH_CPU_64_BITS)
   // On my Ubuntu system, /usr/lib64 is a symlink to /usr/lib.
   // But a user reported on their Fedora system they are separate.
   plugin_dirs->push_back(FilePath("/usr/lib64/browser-plugins"));
   plugin_dirs->push_back(FilePath("/usr/lib64/mozilla/plugins"));
   plugin_dirs->push_back(FilePath("/usr/lib64/firefox/plugins"));
   plugin_dirs->push_back(FilePath("/usr/lib64/xulrunner-addons/plugins"));
-#endif
+#endif  // defined(ARCH_CPU_64_BITS)
+#endif  // !defined(OS_CHROMEOS)
 }
 
 void PluginList::LoadPluginsFromDir(const FilePath& dir_path,
                                     std::vector<WebPluginInfo>* plugins,
                                     std::set<FilePath>* visited_plugins) {
   // See ScanPluginsDirectory near
   // http://mxr.mozilla.org/firefox/source/modules/plugin/base/src/nsPluginHostImpl.cpp#5052
 
   // Construct and stat a list of all filenames under consideration, for
   // later sorting by mtime.
@@ skipping 88 matching lines @@
 
   // TODO(evanm): prefer the newest version of flash, etc. here?
 
   LOG_IF(INFO, PluginList::DebugPluginLoading())
       << "Using " << info.path.value();
 
   return true;
 }
 
 }  // namespace NPAPI