Supervised users: Slightly relax restrictions around extensions.

chrome/browser/extensions/extension_disabled_ui.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/extension_disabled_ui.h"
 
 #include <bitset>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 288 matching lines @@
   if (is_remote_install_) {
     messages.push_back(l10n_util::GetStringFUTF16(
         extension_->is_app()
             ? IDS_APP_DISABLED_REMOTE_INSTALL_ERROR_LABEL
             : IDS_EXTENSION_DISABLED_REMOTE_INSTALL_ERROR_LABEL,
         base::UTF8ToUTF16(extension_->name())));
     if (!permission_warnings.empty())
       messages.push_back(
           l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_WILL_HAVE_ACCESS_TO));
   } else {
+    // TODO(treib): Add an extra message for supervised users?
     messages.push_back(l10n_util::GetStringFUTF16(
         extension_->is_app() ? IDS_APP_DISABLED_ERROR_LABEL
                              : IDS_EXTENSION_DISABLED_ERROR_LABEL,
         base::UTF8ToUTF16(extension_->name())));
     messages.push_back(l10n_util::GetStringUTF16(
         IDS_EXTENSION_PROMPT_WILL_NOW_HAVE_ACCESS_TO));
   }
   for (size_t i = 0; i < permission_warnings.size(); ++i) {
     messages.push_back(l10n_util::GetStringFUTF16(
         IDS_EXTENSION_PERMISSION_LINE, permission_warnings[i]));
   }
   return messages;
 }
 
 base::string16 ExtensionDisabledGlobalError::GetBubbleViewAcceptButtonLabel() {
+  if (service_->profile()->IsSupervised() &&
+      extension_->was_installed_by_custodian()) {

[benwells, 2015/02/24 07:33:47]

This logic is repeated a few times. You should put this into a well named
function in extension_util.

[Marc Treib, 2015/02/24 10:33:39]

The "well-named" is the hard part ;)
Done (I hope)

+    // TODO(treib): Probably use a new string here once we get UX design.

[benwells, 2015/02/24 07:33:47]

These TODOs are a bit concerning. If this doesn't have UX design, should it be
behind a flag?

If the TODOs stay you sould add a crbug link.

[Marc Treib, 2015/02/24 10:33:39]

There's currently no way for a user to trigger this UI, so no need for an
explicit flag.
Done.

+    // For now, just re-use an existing string that says "OK".
+    return l10n_util::GetStringUTF16(IDS_EXTENSION_ALERT_ITEM_OK);
+  }
   if (is_remote_install_) {
     return l10n_util::GetStringUTF16(
         IDS_EXTENSION_PROMPT_REMOTE_INSTALL_BUTTON);
-  } else {
-    return l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_RE_ENABLE_BUTTON);
   }
+  return l10n_util::GetStringUTF16(IDS_EXTENSION_PROMPT_RE_ENABLE_BUTTON);
 }
 
 base::string16 ExtensionDisabledGlobalError::GetBubbleViewCancelButtonLabel() {
+  // For custodian-installed extensions, supervised users only get a single
+  // "acknowledge" button.
+  if (service_->profile()->IsSupervised() &&
+      extension_->was_installed_by_custodian()) {
+    return base::string16();
+  }
   return l10n_util::GetStringUTF16(IDS_EXTENSIONS_UNINSTALL);
 }
 
 void ExtensionDisabledGlobalError::OnBubbleViewDidClose(Browser* browser) {
 }
 
 void ExtensionDisabledGlobalError::BubbleViewAcceptButtonPressed(
     Browser* browser) {
+  // Supervised users can't re-enable custodian-installed extensions, just
+  // acknowledge that they've been disabled.
+  if (service_->profile()->IsSupervised() &&
+      extension_->was_installed_by_custodian()) {
+    return;
+  }
   // Delay extension reenabling so this bubble closes properly.
   base::MessageLoop::current()->PostTask(FROM_HERE,
       base::Bind(&ExtensionService::GrantPermissionsAndEnableExtension,
                  service_->AsWeakPtr(), extension_));
 }
 
 void ExtensionDisabledGlobalError::BubbleViewCancelButtonPressed(
     Browser* browser) {
+  // This button shouldn't exist for custodian-installed extensions in a
+  // supervised profile.
+  DCHECK(!service_->profile()->IsSupervised() ||
+         !extension_->was_installed_by_custodian());
   uninstall_dialog_.reset(extensions::ExtensionUninstallDialog::Create(
       service_->profile(), browser->window()->GetNativeWindow(), this));
   // Delay showing the uninstall dialog, so that this function returns
   // immediately, to close the bubble properly. See crbug.com/121544.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&extensions::ExtensionUninstallDialog::ConfirmUninstall,
                  uninstall_dialog_->AsWeakPtr(),
                  extension_));
 }
@@ skipping 78 matching lines @@
 void ShowExtensionDisabledDialog(ExtensionService* service,
                                  content::WebContents* web_contents,
                                  const Extension* extension) {
   scoped_ptr<ExtensionInstallPrompt> install_ui(
       new ExtensionInstallPrompt(web_contents));
   // This object manages its own lifetime.
   new ExtensionDisabledDialogDelegate(service, install_ui.Pass(), extension);
 }
 
 }  // namespace extensions