Fix selection after deleting cookies.

chrome/browser/views/options/cookies_view.cc

 // Copyright (c) 2006-2008 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 <algorithm>
 
 #include "chrome/browser/views/options/cookies_view.h"
 
 #include "base/string_util.h"
 #include "base/time_format.h"
@@ skipping 262 matching lines @@
   if (SelectedRowCount() <= 0)
     return;
 
   if (SelectedRowCount() == cookies_model_->RowCount()) {
     cookies_model_->RemoveAllShownCookies();
     return;
   }
 
   // Remove the selected cookies.  This iterates over the rows backwards, which
   // is required when calling RemoveCookies, see bug 2994.
-  int first_selected_row = -1;
+  int last_selected_view_row = -1;
+  int remove_count = 0;
   for (views::TableView::iterator i = SelectionBegin();
        i != SelectionEnd(); ++i) {
-    int selected_row = *i;
-    if (first_selected_row == -1)
-      first_selected_row = selected_row;
-    cookies_model_->RemoveCookies(selected_row, 1);
+    int selected_model_row = *i;
+    ++remove_count;
+    if (last_selected_view_row == -1) {
+      // Store the view row since the view to model mapping changes when
+      // we delete.
+      last_selected_view_row = model_to_view(selected_model_row);
+    }
+    cookies_model_->RemoveCookies(selected_model_row, 1);
   }
-  // Keep an element selected
-  if (RowCount() > 0)
-    Select(std::min(RowCount() - 1, first_selected_row));
+
+  // Select the next row after the last row deleted (unless removing last row).
+  DCHECK(RowCount() > 0);
+  Select(view_to_model(std::min(RowCount() - 1, 
+      last_selected_view_row - remove_count + 1)));
 }
 
 void CookiesTableView::OnKeyDown(unsigned short virtual_keycode) {
   if (virtual_keycode == VK_DELETE)
     RemoveSelectedCookies();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookieInfoView
 //
@@ skipping 469 matching lines @@
 void CookiesView::ResetSearchQuery() {
   search_field_->SetText(EmptyWString());
   UpdateSearchResults();
 }
 
 void CookiesView::UpdateForEmptyState() {
   info_view_->ClearCookieDisplay();
   remove_button_->SetEnabled(false);
   remove_all_button_->SetEnabled(false);
 }