Mark default apps on ChromeOS installed from DIR_EXTERNAL_EXTENSIONS "from webstore"

chrome/browser/extensions/external_extension_provider_impl.cc

 // Copyright (c) 2012 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 "chrome/browser/extensions/external_extension_provider_impl.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 297 matching lines @@
 
   provider_list->push_back(
       linked_ptr<ExternalExtensionProviderInterface>(
           new ExternalExtensionProviderImpl(
               service,
               new ExternalPrefExtensionLoader(
                   chrome::DIR_EXTERNAL_EXTENSIONS,
                   check_admin_permissions_on_mac),
               Extension::EXTERNAL_PREF,
               Extension::EXTERNAL_PREF_DOWNLOAD,
+#if defined(OS_CHROMEOS)
+              Extension::FROM_WEBSTORE)));
+#else
               Extension::NO_FLAGS)));
+#endif
 
-#if defined(OS_CHROMEOS)
-  // Define a per-user source of external default extensions, which serves
-  // as a source for OEM customization. Mark these default extensions as
-  // being from the webstore so they can load Native Client modules.
+#if defined(OS_CHROMEOS) || defined (OS_MACOSX)
+  // Define a per-user source of external extensions.
+  // On Chrome OS, this serves as a source for OEM customization.
   provider_list->push_back(
       linked_ptr<ExternalExtensionProviderInterface>(
           new ExternalExtensionProviderImpl(
-              service,
-              new ExternalPrefExtensionLoader(
-                  chrome::DIR_USER_EXTERNAL_EXTENSIONS,
-                  ExternalPrefExtensionLoader::NONE),
-              Extension::EXTERNAL_PREF,
-              Extension::EXTERNAL_PREF_DOWNLOAD,
-              Extension::FROM_WEBSTORE)));
-#endif
-#if defined (OS_MACOSX)
-  // Define a per-user source of external extensions.
-  provider_list->push_back(
-      linked_ptr<ExternalExtensionProviderInterface>(
-          new ExternalExtensionProviderImpl(
               service,
               new ExternalPrefExtensionLoader(
                   chrome::DIR_USER_EXTERNAL_EXTENSIONS,
                   ExternalPrefExtensionLoader::NONE),
               Extension::EXTERNAL_PREF,
               Extension::EXTERNAL_PREF_DOWNLOAD,
               Extension::NO_FLAGS)));
 #endif
 #if defined(OS_WIN)
   provider_list->push_back(
@@ skipping 39 matching lines @@
         linked_ptr<ExternalExtensionProviderInterface>(
           new ExternalExtensionProviderImpl(
               service,
               connector->GetAppPackUpdater()->CreateExternalExtensionLoader(),
               Extension::EXTERNAL_PREF,
               Extension::INVALID,
               Extension::NO_FLAGS)));
   }
 #endif
 }