summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-23 23:15:21 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-23 23:15:21 +0000
commit0b0f60d96020eb44648869a7199520fd5b9f75e0 (patch)
tree83a79449837f82ae8c68afa0d29d452270f8912c
parent355276d8ef4f0582ecfbb91d947a5c8f2057774a (diff)
downloadchromium_src-0b0f60d96020eb44648869a7199520fd5b9f75e0.zip
chromium_src-0b0f60d96020eb44648869a7199520fd5b9f75e0.tar.gz
chromium_src-0b0f60d96020eb44648869a7199520fd5b9f75e0.tar.bz2
gtk: Set the treeview column title even for headers we aren't displaying. Older versions of gtk trip up on an empty title string.
BUG=15445 TEST=Watch the Linux valgrind bot stay green. Review URL: http://codereview.chromium.org/159312 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21468 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/gtk/bookmark_editor_gtk.cc4
-rw-r--r--chrome/test/data/valgrind/unit_tests.gtest_linux.txt3
2 files changed, 2 insertions, 5 deletions
diff --git a/chrome/browser/gtk/bookmark_editor_gtk.cc b/chrome/browser/gtk/bookmark_editor_gtk.cc
index c4ccb70..8b449a4 100644
--- a/chrome/browser/gtk/bookmark_editor_gtk.cc
+++ b/chrome/browser/gtk/bookmark_editor_gtk.cc
@@ -160,11 +160,11 @@ void BookmarkEditorGtk::Init(GtkWindow* parent_window) {
GtkTreeViewColumn* icon_column =
gtk_tree_view_column_new_with_attributes(
- "", gtk_cell_renderer_pixbuf_new(), "pixbuf",
+ "FolderIcon", gtk_cell_renderer_pixbuf_new(), "pixbuf",
bookmark_utils::FOLDER_ICON, NULL);
GtkTreeViewColumn* name_column =
gtk_tree_view_column_new_with_attributes(
- "", gtk_cell_renderer_text_new(), "text",
+ "FolderName", gtk_cell_renderer_text_new(), "text",
bookmark_utils::FOLDER_NAME, NULL);
tree_view_ = gtk_tree_view_new_with_model(GTK_TREE_MODEL(tree_store_));
diff --git a/chrome/test/data/valgrind/unit_tests.gtest_linux.txt b/chrome/test/data/valgrind/unit_tests.gtest_linux.txt
deleted file mode 100644
index b78da34..0000000
--- a/chrome/test/data/valgrind/unit_tests.gtest_linux.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# See http://crbug.com/15445
-# Only fails on the bots?
-BookmarkEditorGtkTest.*