Introduces an additional extension loader that load extra extensions based on per-extension json fi…

chrome/browser/extensions/external_extension_provider_impl.cc

Index: chrome/browser/extensions/external_extension_provider_impl.cc
===================================================================
--- chrome/browser/extensions/external_extension_provider_impl.cc	(revision 133542)
+++ chrome/browser/extensions/external_extension_provider_impl.cc	(working copy)
@@ -35,6 +35,10 @@
 #include "chrome/browser/extensions/default_apps.h"
 #endif
 
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#include "chrome/browser/extensions/external_filesystem_extension_loader_linux.h"
+#endif
+
 #if defined(OS_WIN)
 #include "chrome/browser/extensions/external_registry_extension_loader_win.h"
 #endif
@@ -355,10 +359,23 @@
               Extension::INVALID,
               Extension::NO_FLAGS)));
 #endif
+
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   provider_list->push_back(
       linked_ptr<ExternalExtensionProviderInterface>(
           new ExternalExtensionProviderImpl(
               service,
+              new ExternalFilesystemExtensionLoader(

[Finnur, 2012/04/25 13:33:45]

As mentioned, I think a new loader is not required, only a new provider.

+                  chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS),
+              Extension::EXTERNAL_PREF,
+              Extension::EXTERNAL_PREF_DOWNLOAD,
+              Extension::NO_FLAGS)));
+#endif
+
+  provider_list->push_back(
+      linked_ptr<ExternalExtensionProviderInterface>(
+          new ExternalExtensionProviderImpl(
+              service,
               new ExternalPolicyExtensionLoader(profile),
               Extension::INVALID,
               Extension::EXTERNAL_POLICY_DOWNLOAD,