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

chrome/browser/supervised_user/supervised_user_service.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/supervised_user/supervised_user_service.h"
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 268 matching lines @@
   // all existing extensions.
   ExtensionService* extension_service =
       extensions::ExtensionSystem::Get(profile_)->extension_service();
 
   // |extension_service| can be NULL in a unit test.
   if (extension_service &&
       extension_service->GetInstalledExtension(extension->id()))
     return true;
 
   bool was_installed_by_default = extension->was_installed_by_default();
+  bool was_installed_by_custodian = extension->was_installed_by_custodian();
 #if defined(OS_CHROMEOS)
   // On Chrome OS all external sources are controlled by us so it means that
   // they are "default". Method was_installed_by_default returns false because
   // extensions creation flags are ignored in case of default extensions with
   // update URL(the flags aren't passed to OnExternalExtensionUpdateUrlFound).
   // TODO(dpolukhin): remove this Chrome OS specific code as soon as creation
   // flags are not ignored.
   was_installed_by_default =
       extensions::Manifest::IsExternalLocation(extension->location());
 #endif
   if (extension->location() == extensions::Manifest::COMPONENT ||
-      was_installed_by_default) {
+      was_installed_by_default ||
+      was_installed_by_custodian) {
     return true;
   }
 
   if (error)
     *error = tmp_error;
   return false;
 }
 
 bool SupervisedUserService::UserMayModifySettings(
     const extensions::Extension* extension,
@@ skipping 452 matching lines @@
 
 void SupervisedUserService::OnBrowserSetLastActive(Browser* browser) {
   bool profile_became_active = profile_->IsSameProfile(browser->profile());
   if (!is_profile_active_ && profile_became_active)
     content::RecordAction(UserMetricsAction("ManagedUsers_OpenProfile"));
   else if (is_profile_active_ && !profile_became_active)
     content::RecordAction(UserMetricsAction("ManagedUsers_SwitchProfile"));
 
   is_profile_active_ = profile_became_active;
 }