Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(553)

Side by Side Diff: chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.cc

Issue 8772064: Adds back BookmarkNode::IsVisible. Turns out we want to conditionally (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tweaks Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h" 5 #include "chrome/browser/ui/gtk/bookmarks/bookmark_tree_model.h"
6 6
7 #include <gtk/gtk.h> 7 #include <gtk/gtk.h>
8 8
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/utf_string_conversions.h" 10 #include "base/utf_string_conversions.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 GtkTreeStore* MakeFolderTreeStore() { 111 GtkTreeStore* MakeFolderTreeStore() {
112 return gtk_tree_store_new(FOLDER_STORE_NUM_COLUMNS, GDK_TYPE_PIXBUF, 112 return gtk_tree_store_new(FOLDER_STORE_NUM_COLUMNS, GDK_TYPE_PIXBUF,
113 G_TYPE_STRING, G_TYPE_INT64, G_TYPE_BOOLEAN); 113 G_TYPE_STRING, G_TYPE_INT64, G_TYPE_BOOLEAN);
114 } 114 }
115 115
116 void AddToTreeStore(BookmarkModel* model, int64 selected_id, 116 void AddToTreeStore(BookmarkModel* model, int64 selected_id,
117 GtkTreeStore* store, GtkTreeIter* selected_iter) { 117 GtkTreeStore* store, GtkTreeIter* selected_iter) {
118 const BookmarkNode* root_node = model->root_node(); 118 const BookmarkNode* root_node = model->root_node();
119 for (int i = 0; i < root_node->child_count(); ++i) { 119 for (int i = 0; i < root_node->child_count(); ++i) {
120 const BookmarkNode* child = root_node->GetChild(i); 120 const BookmarkNode* child = root_node->GetChild(i);
121 AddToTreeStoreAt(child, selected_id, store, selected_iter, NULL); 121 if (child->IsVisible())
122 AddToTreeStoreAt(child, selected_id, store, selected_iter, NULL);
122 } 123 }
123 } 124 }
124 125
125 GtkWidget* MakeTreeViewForStore(GtkTreeStore* store) { 126 GtkWidget* MakeTreeViewForStore(GtkTreeStore* store) {
126 GtkTreeViewColumn* column = gtk_tree_view_column_new(); 127 GtkTreeViewColumn* column = gtk_tree_view_column_new();
127 GtkCellRenderer* image_renderer = gtk_cell_renderer_pixbuf_new(); 128 GtkCellRenderer* image_renderer = gtk_cell_renderer_pixbuf_new();
128 gtk_tree_view_column_pack_start(column, image_renderer, FALSE); 129 gtk_tree_view_column_pack_start(column, image_renderer, FALSE);
129 gtk_tree_view_column_add_attribute(column, image_renderer, 130 gtk_tree_view_column_add_attribute(column, image_renderer,
130 "pixbuf", FOLDER_ICON); 131 "pixbuf", FOLDER_ICON);
131 GtkCellRenderer* text_renderer = gtk_cell_renderer_text_new(); 132 GtkCellRenderer* text_renderer = gtk_cell_renderer_text_new();
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 ret_val = UTF8ToUTF16(utf8str); 236 ret_val = UTF8ToUTF16(utf8str);
236 g_value_unset(&value); 237 g_value_unset(&value);
237 } else { 238 } else {
238 NOTREACHED() << "Impossible type mismatch"; 239 NOTREACHED() << "Impossible type mismatch";
239 } 240 }
240 241
241 return ret_val; 242 return ret_val;
242 } 243 }
243 244
244 } // namespace bookmark_utils 245 } // namespace bookmark_utils
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698