Merge 143541 - Fix edit profile link in NTP

chrome/browser/resources/options2/browser_options.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;
   var RepeatingButton = cr.ui.RepeatingButton;
 
   //
@@ skipping 219 matching lines @@
         profilesList.autoExpands = true;
 
         this.setProfilesInfo_(loadTimeData.getValue('profilesInfo'));
 
         profilesList.addEventListener('change',
             this.setProfileViewButtonsStatus_);
         $('profiles-create').onclick = function(event) {
           chrome.send('createProfile');
         };
         $('profiles-manage').onclick = function(event) {
-          var selectedProfile = self.getSelectedProfileItem_();
-          if (selectedProfile)
-            ManageProfileOverlay.showManageDialog(selectedProfile);
+          ManageProfileOverlay.showManageDialog();
         };
         $('profiles-delete').onclick = function(event) {
           var selectedProfile = self.getSelectedProfileItem_();
           if (selectedProfile)
             ManageProfileOverlay.showDeleteDialog(selectedProfile);
         };
       }
 
       if (cr.isChromeOS) {
         if (!UIAccountTweaks.loggedInAsGuest()) {
@@ skipping 748 matching lines @@
      *         filePath: "/path/to/profile/data/on/disk",
      *         isCurrentProfile: false
      *       };
      * @private
      */
     setProfilesInfo_: function(profiles) {
       this.setProfileViewSingle_(profiles.length);
       // add it to the list, even if the list is hidden so we can access it
       // later.
       $('profiles-list').dataModel = new ArrayDataModel(profiles);
-      // We got new data, close the open overlay if it's open.
-      ManageProfileOverlay.getInstance().visible = false;
+
+      // Received new data. If showing the "manage" overlay, keep it up to
+      // date. If showing the "delete" overlay, close it.
+      if (ManageProfileOverlay.getInstance().visible &&
+          !$('manage-profile-overlay-manage').hidden) {
+        ManageProfileOverlay.showManageDialog();
+      } else {
+        ManageProfileOverlay.getInstance().visible = false;
+      }
+
       this.setProfileViewButtonsStatus_();
     },
 
+    /**
+     * Returns the currently active profile for this browser window.
+     * @return {Object} A profile info object.
+     * @private
+     */
+    getCurrentProfile_: function() {
+      for (var i = 0; i < $('profiles-list').dataModel.length; i++) {
+        var profile = $('profiles-list').dataModel.item(i);
+        if (profile.isCurrentProfile)
+          return profile;
+      }
+
+      assert(false,
+             'There should always be a current profile, but none found.');
+    },
+
     setGtkThemeButtonEnabled_: function(enabled) {
       if (!cr.isChromeOS && navigator.platform.match(/linux|BSD/i))
         $('themes-GTK-button').disabled = !enabled;
     },
 
     setThemesResetButtonEnabled_: function(enabled) {
       $('themes-reset').disabled = !enabled;
     },
 
     /**
@@ skipping 326 matching lines @@
     setContentFilterSettingsValue_: function(dict) {
       if ('cookies' in dict && 'value' in dict['cookies'])
         this.sessionOnlyCookies_ = dict['cookies']['value'] == 'session';
     }
 
   };
 
   //Forward public APIs to private implementations.
   [
     'addBluetoothDevice',
+    'getCurrentProfile',
     'getStartStopSyncButton',
     'hideBluetoothSettings',
     'removeCloudPrintConnectorSection',
     'removeBluetoothDevice',
     'setAutoOpenFileTypesDisplayed',
     'setBackgroundModeCheckboxState',
     'setBluetoothState',
     'setCheckRevocationCheckboxState',
     'setContentFilterSettingsValue',
     'setFontSize',
@@ skipping 36 matching lines @@
     BrowserOptions.getLoggedInUsername = function() {
       return BrowserOptions.getInstance().username_;
     };
   }
 
   // Export
   return {
     BrowserOptions: BrowserOptions
   };
 });