Modifies the external extension preferences loader to load not only external_extensions.json but al…

chrome/common/chrome_paths.cc

Index: chrome/common/chrome_paths.cc
===================================================================
--- chrome/common/chrome_paths.cc	(revision 134520)
+++ chrome/common/chrome_paths.cc	(working copy)
@@ -71,6 +71,18 @@
     FILE_PATH_LITERAL("pepper/libppgoogletalk.so");
 
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX)
+
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+// The path to the external extension <id>.json files.
+// /usr/share seems like a good choice, see: http://www.pathname.com/fhs/
+const char kFilepathSinglePrefExtensions[] =
+#if defined(GOOGLE_CHROME_BUILD)
+    FILE_PATH_LITERAL("/usr/share/google-chrome/extensions");
+#else
+    FILE_PATH_LITERAL("/usr/share/chromium/extensions");
+#endif  // defined(GOOGLE_CHROME_BUILD)
+#endif  // defined(OS_LINUX) && !defined(OS_CHROMEOS)
+
 }  // namespace
 
 namespace chrome {
@@ -361,6 +373,12 @@
       break;
     }
 #endif
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+    case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
+      cur = FilePath(FILE_PATH_LITERAL(kFilepathSinglePrefExtensions));
+      break;
+    }
+#endif
     case chrome::DIR_EXTERNAL_EXTENSIONS:
 #if defined(OS_MACOSX)
       if (!chrome::GetGlobalApplicationSupportDirectory(&cur))