Update strings to match the final spec: two forgotten files

chrome/browser/resources/options/manage_profile_overlay.js

 // 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.
 
 cr.define('options', function() {
   var OptionsPage = options.OptionsPage;
   var ArrayDataModel = cr.ui.ArrayDataModel;
 
   /**
    * ManageProfileOverlay class
@@ skipping 41 matching lines @@
       // closing the overlay until we finish creating the profile.
       $('create-profile-ok').onclick = function(event) {
         self.submitCreateProfile_();
       };
 
       $('create-profile-cancel').onclick = function(event) {
         CreateProfileOverlay.cancelCreateProfile();
       };
 
       if (loadTimeData.getBoolean('managedUsersEnabled')) {
-        $('create-profile-limited-container').hidden = false;
+        $('create-profile-managed-container').hidden = false;
       }
       $('manage-profile-cancel').onclick =
           $('delete-profile-cancel').onclick = function(event) {
         OptionsPage.closeOverlay();
       };
       $('delete-profile-ok').onclick = function(event) {
         OptionsPage.closeOverlay();
         chrome.send('deleteProfile', [self.profileInfo_.filePath]);
       };
       $('add-shortcut-button').onclick = function(event) {
         chrome.send('addProfileShortcut', [self.profileInfo_.filePath]);
       };
       $('remove-shortcut-button').onclick = function(event) {
         chrome.send('removeProfileShortcut', [self.profileInfo_.filePath]);
       };
 
-      $('create-profile-limited-signed-in-link').onclick = function(event) {
+      $('create-profile-managed-signed-in-link').onclick = function(event) {
         OptionsPage.navigateToPage('managedUserLearnMore');
         return false;
       };
 
-      $('create-profile-limited-not-signed-in-link').onclick = function(event) {
+      $('create-profile-managed-not-signed-in-link').onclick = function(event) {
         // The signin process will open an overlay to configure sync, which
         // would replace this overlay. It's smoother to close this one now.
         // TODO(pamg): Move the sync-setup overlay to a higher layer so this one
         // can stay open under it, after making sure that doesn't break anything
         // else.
         OptionsPage.closeOverlay();
         SyncSetupOverlay.startSignIn();
       };
     },
 
@@ skipping 41 matching lines @@
         submitFunction();
       };
     },
 
     /**
      * Set the profile info used in the dialog.
      * @param {Object} profileInfo An object of the form:
      *     profileInfo = {
      *       name: "Profile Name",
      *       iconURL: "chrome://path/to/icon/image",
-     *       filePath: "/path/to/profile/data/on/disk"
+     *       filePath: "/path/to/profile/data/on/disk",
      *       isCurrentProfile: false,
+     *       isManaged: false
      *     };
      * @param {string} mode A label that specifies the type of dialog
      *     box which is currently being viewed (i.e. 'create' or
      *     'manage').
      * @private
      */
     setProfileInfo_: function(profileInfo, mode) {
       this.iconGridSelectedURL_ = profileInfo.iconURL;
       this.profileInfo_ = profileInfo;
       $(mode + '-profile-name').value = profileInfo.name;
@@ skipping 143 matching lines @@
      */
     submitCreateProfile_: function() {
       this.hideErrorBubble_('create');
       CreateProfileOverlay.updateCreateInProgress(true);
 
       // Get the user's chosen name and icon, or default if they do not
       // wish to customize their profile.
       var name = $('create-profile-name').value;
       var iconUrl = $('create-profile-icon-grid').selectedItem;
       var createShortcut = $('create-shortcut').checked;
-      var isManaged = $('create-profile-limited').checked;
+      var isManaged = $('create-profile-managed').checked;
 
       // 'createProfile' is handled by the BrowserOptionsHandler.
       chrome.send('createProfile',
                   [name, iconUrl, createShortcut, isManaged]);
     },
 
     /**
      * Called when the selected icon in the icon grid changes.
      * @param {string} mode A label that specifies the type of dialog
      *     box which is currently being viewed (i.e. 'create' or
@@ skipping 41 matching lines @@
      */
     showDeleteDialog_: function(profileInfo) {
       ManageProfileOverlay.setProfileInfo(profileInfo, 'manage');
       $('manage-profile-overlay-create').hidden = true;
       $('manage-profile-overlay-manage').hidden = true;
       $('manage-profile-overlay-delete').hidden = false;
       $('delete-profile-message').textContent =
           loadTimeData.getStringF('deleteProfileMessage', profileInfo.name);
       $('delete-profile-message').style.backgroundImage = 'url("' +
           profileInfo.iconURL + '")';
+      $('delete-managed-profile-addendum').hidden = !profileInfo.isManaged;
 
       // Because this dialog isn't useful when refreshing or as part of the
       // history, don't create a history entry for it when showing.
       OptionsPage.showPageByName('manageProfile', false);
     },
 
     /**
      * Display the "Create Profile" dialog.
      * @private
      */
@@ skipping 80 matching lines @@
      * Note that hideErrorBubble_() also enables the "OK" button, so it
      * must be called before this function if both are used.
      * @param {boolean} inProgress True if the UI should be updated to show that
      *     profile creation is now in progress.
      * @private
      */
     updateCreateInProgress_: function(inProgress) {
       $('create-profile-icon-grid').disabled = inProgress;
       $('create-profile-name').disabled = inProgress;
       $('create-shortcut').disabled = inProgress;
-      $('create-profile-limited').disabled = inProgress;
+      $('create-profile-managed').disabled = inProgress;
       $('create-profile-ok').disabled = inProgress;
 
       $('create-profile-throbber').hidden = !inProgress;
     },
 
     /**
      * Cancels the creation of the a profile. It is safe to call this even
      * when no profile is in the process of being created.
      * @private
      */
@@ skipping 20 matching lines @@
      * error) when creating a new profile. Called by BrowserOptions via the
      * BrowserOptionsHandler.
      * @private
      */
     onRemoteError_: function() {
       this.updateCreateInProgress_(false);
       this.showErrorBubble_('createProfileRemoteError');
     },
 
     /**
-     * For new limited users, shows a confirmation page after successfully
+     * For new supervised users, shows a confirmation page after successfully
      * creating a new profile; otherwise, the handler will open a new window.
      * @param {Object} profileInfo An object of the form:
      *     profileInfo = {
      *       name: "Profile Name",
      *       filePath: "/path/to/profile/data/on/disk"
      *       isManaged: (true|false),
      *     };
      * @private
      */
     onSuccess_: function(profileInfo) {
       this.updateCreateInProgress_(false);
       OptionsPage.closeOverlay();
       if (profileInfo.isManaged) {
         ManagedUserCreateConfirmOverlay.setProfileInfo(profileInfo);
         OptionsPage.navigateToPage('managedUserCreateConfirm');
       }
     },
 
     /**
      * Updates the signed-in or not-signed-in UI when in create mode. Called by
      * the handler in response to the 'requestSignedInText' message.
      * @param {string} text The text to show for a signed-in user. An empty
      *     string indicates that the user is not signed in.
      * @private
      */
     updateSignedInStatus_: function(text) {
       var isSignedIn = text !== '';
-      $('create-profile-limited-signed-in').hidden = !isSignedIn;
-      $('create-profile-limited-not-signed-in').hidden = isSignedIn;
-      $('create-profile-limited').disabled = !isSignedIn;
+      $('create-profile-managed-signed-in').hidden = !isSignedIn;
+      $('create-profile-managed-not-signed-in').hidden = isSignedIn;
+      $('create-profile-managed').disabled = !isSignedIn;
+      if (!isSignedIn)
+        $('create-profile-managed').checked = false;
       if (!isSignedIn)

[Sergiu, 2013/06/21 13:21:22]

Think you forgot to delete this "if" clause.

[Pam (message me for reviews), 2013/06/21 13:29:38]

Oh, bad merging. Thanks.

         $('create-profile-limited').checked = false;
 
-      $('create-profile-limited-signed-in-label').textContent = text;
+      $('create-profile-managed-signed-in-label').textContent = text;
     },
   };
 
   // Forward public APIs to private implementations.
   [
     'cancelCreateProfile',
     'onLocalError',
     'onRemoteError',
     'onSuccess',
     'updateCreateInProgress',
     'updateSignedInStatus',
   ].forEach(function(name) {
     CreateProfileOverlay[name] = function() {
       var instance = CreateProfileOverlay.getInstance();
       return instance[name + '_'].apply(instance, arguments);
     };
   });
 
   // Export
   return {
     ManageProfileOverlay: ManageProfileOverlay,
     CreateProfileOverlay: CreateProfileOverlay,
   };
 });