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 132213)
+++ chrome/browser/extensions/external_extension_provider_impl.cc	(working copy)
@@ -39,6 +39,10 @@
 #include "chrome/browser/extensions/external_registry_extension_loader_win.h"
 #endif
 
+#if defined(OS_LINUX)

[Sam Kerner (Chrome), 2012/04/13 19:35:13]

You only use this include on non-chrome os linux, so how about:

#if defined(OS_LINUX) && !defined(OS_CHROMEOS)

[Alexandre Abreu, 2012/04/13 21:52:38]

Done.

+#include "chrome/browser/extensions/external_filesystem_extension_loader_linux.h"

[Sam Kerner (Chrome), 2012/04/13 19:35:13]

Includes should be in alphabetical order, so this goes before
external_registry_extension_loader_win.h .

[Alexandre Abreu, 2012/04/13 21:52:38]

Done.

+#endif
+
 using content::BrowserThread;
 
 // Constants for keeping track of extension preferences in a dictionary.
@@ -355,10 +359,22 @@
               Extension::INVALID,
               Extension::NO_FLAGS)));
 #endif
+
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
   provider_list->push_back(
       linked_ptr<ExternalExtensionProviderInterface>(
           new ExternalExtensionProviderImpl(
               service,

[Sam Kerner (Chrome), 2012/04/13 19:35:13]

Consider passing in the path constant to the constructor of
ExternalFilesystemExtensionLoader().  

[Alexandre Abreu, 2012/04/13 21:52:38]

Done.

+              new ExternalFilesystemExtensionLoader,
+              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,