OEM folder name support for apps installed from rootfs

chrome/browser/extensions/external_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_provider_impl.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 41 matching lines @@
 
 using content::BrowserThread;
 
 namespace extensions {
 
 // Constants for keeping track of extension preferences in a dictionary.
 const char ExternalProviderImpl::kInstallParam[] = "install_parameter";
 const char ExternalProviderImpl::kExternalCrx[] = "external_crx";
 const char ExternalProviderImpl::kExternalVersion[] = "external_version";
 const char ExternalProviderImpl::kExternalUpdateUrl[] = "external_update_url";
-const char ExternalProviderImpl::kSupportedLocales[] = "supported_locales";
 const char ExternalProviderImpl::kIsBookmarkApp[] = "is_bookmark_app";
 const char ExternalProviderImpl::kIsFromWebstore[] = "is_from_webstore";
 const char ExternalProviderImpl::kKeepIfPresent[] = "keep_if_present";
+const char ExternalProviderImpl::kWasInstalledByOem[] = "was_installed_by_oem";
+const char ExternalProviderImpl::kSupportedLocales[] = "supported_locales";
 
 ExternalProviderImpl::ExternalProviderImpl(
     VisitorInterface* service,
     const scoped_refptr<ExternalLoader>& loader,
     Profile* profile,
     Manifest::Location crx_location,
     Manifest::Location download_location,
     int creation_flags)
     : crx_location_(crx_location),
       download_location_(download_location),
@@ skipping 137 matching lines @@
           ExtensionSystem::Get(profile_)->extension_service();
       const Extension* extension = extension_service ?
           extension_service->GetExtensionById(extension_id, true) : NULL;
       if (!extension) {
         VLOG(1) << "Skip installing (or uninstall) external extension: "
                 << extension_id << " because the extension should be kept "
                 << "only if it is already installed.";
         continue;
       }
     }
+    bool was_installed_by_oem;
+    if (extension->GetBoolean(kWasInstalledByOem, &was_installed_by_oem) &&

[stevenjb, 2014/04/09 18:17:38]

We only set this property in the Chrome code on Chrome OS. Is it possible for an
external process on non-Chrome OS platforms to set an arbitrary extension
preference? If so, then we should probably make this code OS_CHROMEOS only since
we currently don't have OEM folders on other platforms, and it would be weird if
apps showed up in an "OEM" folder that could not be removed from the folder
(although we do always allow un-installing them).

+        was_installed_by_oem) {
+      creation_flags |= Extension::WAS_INSTALLED_BY_OEM;
+    }
 
     std::string install_parameter;
     extension->GetString(kInstallParam, &install_parameter);
 
     if (has_external_crx) {
       if (crx_location_ == Manifest::INVALID_LOCATION) {
         LOG(WARNING) << "This provider does not support installing external "
                      << "extensions from crx files.";
         continue;
       }
@@ skipping 311 matching lines @@
             service,
             new ExternalComponentLoader(profile),
             profile,
             Manifest::INVALID_LOCATION,
             Manifest::EXTERNAL_COMPONENT,
             Extension::FROM_WEBSTORE | Extension::WAS_INSTALLED_BY_DEFAULT)));
   }
 }
 
 }  // namespace extensions