Options: Fix the startup pages list.

* List was disabled even though the radio was checked.
* When the list input gets focus (via tab), set this item as the selected index.

BUG=89614
TEST=none

R=csilv@chromium.or

Review URL: http://codereview.chromium.org/7566013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95301 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 15 insertions, 0 deletions

diff --git a/chrome/browser/resources/options/browser_options.js b/chrome/browser/resources/options/browser_options.js
index 14808b8..9dd38c5 100644
--- a/chrome/browser/resources/options/browser_options.js
+++ b/chrome/browser/resources/options/browser_options.js
@@ -276,6 +276,8 @@ cr.define('options', function() {
         if (items[i].value == value)
           items[i].checked = true;
       }
+
+      this.updateCustomStartupPageControlStates_();
     },
 
     /**
diff --git a/chrome/browser/resources/options/inline_editable_list.js b/chrome/browser/resources/options/inline_editable_list.js
index b01d4a3..b762a1d 100644
--- a/chrome/browser/resources/options/inline_editable_list.js
+++ b/chrome/browser/resources/options/inline_editable_list.js
@@ -83,6 +83,18 @@ cr.define('options', function() {
     },
 
     /**
+     * Called when the input element receives focus. Selects this item in the
+     * list selection model.
+     * @private
+     */
+    handleFocus_: function() {
+      var list = this.parentNode;
+      var index = list.getIndexOfListItem(this);
+      list.selectionModel.selectedIndex = index;
+      list.selectionModel.anchorIndex = index;
+    },
+
+    /**
      * Called when this element gains or loses 'lead' status. Updates editing
      * mode accordingly.
      * @private
@@ -231,6 +243,7 @@ cr.define('options', function() {
         inputEl.setAttribute('displaymode', 'edit');
         inputEl.staticVersion = textEl;
       }
+      inputEl.addEventListener('focus', this.handleFocus_.bind(this));
       container.appendChild(inputEl);
       this.editFields_.push(inputEl);