A patch from contributor Thiago Farina:

[Windows] Improve the usage of "Open the following pages:" table.

- Allow multiple selection.
- Select the next row after the last row deleted or nothing when the row doesn't
have any items.
- Select the item in table when the user add an url.

BUG=19150
TEST=add a bunch of urls, remove them, in different orders, should work fine.


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

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

1 files changed, 12 insertions, 1 deletions

diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc
index e7f9b37..af3fa6b 100644
--- a/chrome/browser/views/options/general_page_view.cc
+++ b/chrome/browser/views/options/general_page_view.cc
@@ -696,7 +696,7 @@ void GeneralPageView::InitStartupGroup() {
   columns.push_back(TableColumn());
   startup_custom_pages_table_ = new views::TableView(
       startup_custom_pages_table_model_.get(), columns,
-      views::ICON_AND_TEXT, true, false, true);
+      views::ICON_AND_TEXT, false, false, true);
   // URLs are inherently left-to-right, so do not mirror the table.
   startup_custom_pages_table_->EnableUIMirroringForRTLLanguages(false);
   startup_custom_pages_table_->SetObserver(this);
@@ -902,10 +902,20 @@ void GeneralPageView::AddURLToStartupURLs() {
 }
 
 void GeneralPageView::RemoveURLsFromStartupURLs() {
+  int selected_row = 0;
   for (views::TableView::iterator i =
        startup_custom_pages_table_->SelectionBegin();
        i != startup_custom_pages_table_->SelectionEnd(); ++i) {
     startup_custom_pages_table_model_->Remove(*i);
+    selected_row = *i;
+  }
+  int row_count = startup_custom_pages_table_->RowCount();
+  if (selected_row >= row_count)
+    selected_row = row_count - 1;
+  if (selected_row >= 0) {
+    // Select the next row after the last row deleted, or the above item if the
+    // latest item was deleted or nothing when the table doesn't have any items.
+    startup_custom_pages_table_->Select(selected_row);
   }
   SaveStartupPref();
 }
@@ -953,6 +963,7 @@ void GeneralPageView::AddBookmark(UrlPicker* dialog,
   else
     index++;
   startup_custom_pages_table_model_->Add(index, url);
+  startup_custom_pages_table_->Select(index);
 
   SaveStartupPref();
 }