Apps&Extensions for supervised users: Add Extension::WAS_INSTALLED_BY_CUSTODIAN flag and proto entry

chrome/browser/extensions/pending_extension_manager.cc

 // Copyright 2014 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/pending_extension_manager.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/version.h"
@@ skipping 72 matching lines @@
   }
 
   return false;
 }
 
 bool PendingExtensionManager::AddFromSync(
     const std::string& id,
     const GURL& update_url,
     PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install,
     bool install_silently,
-    bool remote_install) {
+    bool remote_install,
+    bool installed_by_custodian) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (ExtensionRegistry::Get(context_)->GetExtensionById(
           id, ExtensionRegistry::EVERYTHING)) {
     LOG(ERROR) << "Trying to add pending extension " << id
                << " which already exists";
     return false;
   }
 
   // Make sure we don't ever try to install the CWS app, because even though
   // it is listed as a syncable app (because its values need to be synced) it
   // should already be installed on every instance.
   if (id == extension_misc::kWebStoreAppId) {
     NOTREACHED();
     return false;
   }
 
+  int creation_flags = Extension::NO_FLAGS;
+  if (installed_by_custodian) {
+    creation_flags |= Extension::WAS_INSTALLED_BY_CUSTODIAN;
+  }
+
   static const bool kIsFromSync = true;
   static const Manifest::Location kSyncLocation = Manifest::INTERNAL;
   static const bool kMarkAcknowledged = false;
 
   return AddExtensionImpl(id,
                           std::string(),
                           update_url,
                           Version(),
                           should_allow_install,
                           kIsFromSync,
                           install_silently,
                           kSyncLocation,
-                          Extension::NO_FLAGS,
+                          creation_flags,
                           kMarkAcknowledged,
                           remote_install);
 }
 
 bool PendingExtensionManager::AddFromExtensionImport(
     const std::string& id,
     const GURL& update_url,
     PendingExtensionInfo::ShouldAllowInstallPredicate should_allow_install) {
   CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
@@ skipping 174 matching lines @@
 
   return true;
 }
 
 void PendingExtensionManager::AddForTesting(
     const PendingExtensionInfo& pending_extension_info) {
   pending_extension_list_.push_back(pending_extension_info);
 }
 
 }  // namespace extensions