Reland r51414: "GTK: Fix sorting in content exception window."

chrome/browser/gtk/options/content_exceptions_window_gtk.cc

 // Copyright (c) 2010 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 "chrome/browser/gtk/options/content_exceptions_window_gtk.h"
 
 #include <set>
 
 #include "app/l10n_util.h"
 #include "base/message_loop.h"
@@ skipping 29 matching lines @@
   }
 }
 
 ContentExceptionsWindowGtk::~ContentExceptionsWindowGtk() {
 }
 
 ContentExceptionsWindowGtk::ContentExceptionsWindowGtk(
     GtkWindow* parent,
     HostContentSettingsMap* map,
     ContentSettingsType type) {
-  // Build the model adapters that translate views and TableModels into
-  // something GTK can use.
+  // Build the list backing that GTK uses, along with an adapter which will
+  // sort stuff without changing the underlying backing store.
   list_store_ = gtk_list_store_new(COL_COUNT, G_TYPE_STRING, G_TYPE_STRING);
-  treeview_ = gtk_tree_view_new_with_model(GTK_TREE_MODEL(list_store_));
+  sort_list_store_ = gtk_tree_model_sort_new_with_model(
+      GTK_TREE_MODEL(list_store_));
+  treeview_ = gtk_tree_view_new_with_model(GTK_TREE_MODEL(sort_list_store_));
   g_object_unref(list_store_);
+  g_object_unref(sort_list_store_);
 
   // Set up the properties of the treeview
   gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview_), TRUE);
   g_signal_connect(treeview_, "row-activated",
                    G_CALLBACK(OnTreeViewRowActivateThunk), this);
 
   GtkTreeViewColumn* pattern_column = gtk_tree_view_column_new_with_attributes(
       l10n_util::GetStringUTF8(IDS_EXCEPTIONS_PATTERN_HEADER).c_str(),
       gtk_cell_renderer_text_new(),
       "text", COL_PATTERN,
@@ skipping 113 matching lines @@
 
   gtk_tree::SelectAndFocusRowNum(new_index, GTK_TREE_VIEW(treeview_));
 
   UpdateButtonState();
 }
 
 void ContentExceptionsWindowGtk::UpdateButtonState() {
   int num_selected = gtk_tree_selection_count_selected_rows(
       treeview_selection_);
   int row_count = gtk_tree_model_iter_n_children(
-      GTK_TREE_MODEL(list_store_), NULL);
+      GTK_TREE_MODEL(sort_list_store_), NULL);
 
   // TODO(erg): http://crbug.com/34177 , support editing of more than one entry
   // at a time.
   gtk_widget_set_sensitive(edit_button_, num_selected == 1);
   gtk_widget_set_sensitive(remove_button_, num_selected >= 1);
   gtk_widget_set_sensitive(remove_all_button_, row_count > 0);
 }
 
 void ContentExceptionsWindowGtk::Add(GtkWidget* widget) {
   new ContentExceptionEditor(GTK_WINDOW(dialog_),
                              this, model_.get(), -1,
                              HostContentSettingsMap::Pattern(),
                              CONTENT_SETTING_BLOCK);
 }
 
 void ContentExceptionsWindowGtk::Edit(GtkWidget* widget) {
-  std::set<int> indices;
-  gtk_tree::GetSelectedIndices(treeview_selection_, &indices);
+  std::set<std::pair<int, int> > indices;
+  GetSelectedModelIndices(&indices);
   DCHECK_GT(indices.size(), 0u);
-  int index = *indices.begin();
+  int index = indices.begin()->first;
   const HostContentSettingsMap::PatternSettingPair& entry =
       model_->entry_at(index);
   new ContentExceptionEditor(GTK_WINDOW(dialog_), this, model_.get(), index,
                              entry.first, entry.second);
 }
 
 void ContentExceptionsWindowGtk::Remove(GtkWidget* widget) {
-  std::set<int> selected_indices;
-  gtk_tree::GetSelectedIndices(treeview_selection_, &selected_indices);
+  std::set<std::pair<int, int> > model_selected_indices;
+  GetSelectedModelIndices(&model_selected_indices);
 
-  int selected_row = 0;
-  for (std::set<int>::reverse_iterator i = selected_indices.rbegin();
-       i != selected_indices.rend(); ++i) {
-    model_->RemoveException(*i);
-    selected_row = *i;
+  int selected_row = gtk_tree_model_iter_n_children(
+      GTK_TREE_MODEL(sort_list_store_), NULL);
+  for (std::set<std::pair<int, int> >::reverse_iterator i =
+           model_selected_indices.rbegin();
+       i != model_selected_indices.rend(); ++i) {
+    model_->RemoveException(i->first);
+    selected_row = std::min(selected_row, i->second);
   }
 
   int row_count = model_->RowCount();
   if (row_count <= 0)
     return;
   if (selected_row >= row_count)
     selected_row = row_count - 1;
   gtk_tree::SelectAndFocusRowNum(selected_row,
                                  GTK_TREE_VIEW(treeview_));
 
@@ skipping 16 matching lines @@
     case CONTENT_SETTINGS_TYPE_PLUGINS:
       return l10n_util::GetStringUTF8(IDS_PLUGINS_EXCEPTION_TITLE);
     case CONTENT_SETTINGS_TYPE_POPUPS:
       return l10n_util::GetStringUTF8(IDS_POPUP_EXCEPTION_TITLE);
     default:
       NOTREACHED();
   }
   return std::string();
 }
 
+void ContentExceptionsWindowGtk::GetSelectedModelIndices(
+    std::set<std::pair<int, int> >* indices) {
+  GtkTreeModel* model;
+  GList* paths = gtk_tree_selection_get_selected_rows(treeview_selection_,
+                                                      &model);
+  for (GList* item = paths; item; item = item->next) {
+    GtkTreePath* sorted_path = reinterpret_cast<GtkTreePath*>(item->data);
+    int sorted_row = gtk_tree::GetRowNumForPath(sorted_path);
+    GtkTreePath* path = gtk_tree_model_sort_convert_path_to_child_path(
+        GTK_TREE_MODEL_SORT(sort_list_store_), sorted_path);
+    int row = gtk_tree::GetRowNumForPath(path);
+    gtk_tree_path_free(path);
+    indices->insert(std::make_pair(row, sorted_row));
+  }
+
+  g_list_foreach(paths, (GFunc)gtk_tree_path_free, NULL);
+  g_list_free(paths);
+}
+
 void ContentExceptionsWindowGtk::OnTreeViewRowActivate(
     GtkWidget* sender,
     GtkTreePath* path,
     GtkTreeViewColumn* column) {
   Edit(sender);
 }
 
 void ContentExceptionsWindowGtk::OnWindowDestroy(GtkWidget* widget) {
   instances[model_->content_type()] = NULL;
   MessageLoop::current()->DeleteSoon(FROM_HERE, this);
 }
 
 void ContentExceptionsWindowGtk::OnTreeSelectionChanged(
     GtkWidget* selection) {
   UpdateButtonState();
 }