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

chrome/browser/gtk/options/content_exceptions_window_gtk.h

Index: chrome/browser/gtk/options/content_exceptions_window_gtk.h
diff --git a/chrome/browser/gtk/options/content_exceptions_window_gtk.h b/chrome/browser/gtk/options/content_exceptions_window_gtk.h
index c415419ec2a2bf92d9874f84722ff7390252f6ca..473c6be25e35b3f512db131b2e98f4feb67cbff3 100644
--- a/chrome/browser/gtk/options/content_exceptions_window_gtk.h
+++ b/chrome/browser/gtk/options/content_exceptions_window_gtk.h
@@ -65,6 +65,10 @@ class ContentExceptionsWindowGtk : public gtk_tree::TableAdapter::Delegate,
   // was set to in the constructor).
   std::string GetWindowTitle() const;
 
+  // Gets the selected indicies in the two list stores. Indicies are returned
+  // in <list_store_, sort_list_store_> order.
+  void GetSelectedModelIndices(std::set<std::pair<int, int> >* indices);
+
   // GTK Callbacks
   CHROMEGTK_CALLBACK_2(ContentExceptionsWindowGtk, void,
                        OnTreeViewRowActivate, GtkTreePath*, GtkTreeViewColumn*);
@@ -72,7 +76,12 @@ class ContentExceptionsWindowGtk : public gtk_tree::TableAdapter::Delegate,
   CHROMEGTK_CALLBACK_0(ContentExceptionsWindowGtk, void,
                        OnTreeSelectionChanged);
 
-  // The list presented in |treeview_|; a gobject instead of a C++ object.
+  // The list presented in |treeview_|. Separate from |list_store_|, the list
+  // that backs |sort_model_|. This separation comes so the user can sort the
+  // data on screen without changing the underlying |list_store_|.
+  GtkTreeModel* sort_list_store_;
+
+  // The backing to |sort_list_store_|. Doesn't change when sorted.
   GtkListStore* list_store_;
 
   // The C++, views-ish, cross-platform model class that actually contains the
@@ -96,6 +105,8 @@ class ContentExceptionsWindowGtk : public gtk_tree::TableAdapter::Delegate,
   GtkWidget* edit_button_;
   GtkWidget* remove_button_;
   GtkWidget* remove_all_button_;
+
+  friend class ContentExceptionsWindowGtkUnittest;
 };
 
 #endif  // CHROME_BROWSER_GTK_OPTIONS_CONTENT_EXCEPTIONS_WINDOW_GTK_H_