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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.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/views/bookmarks/bookmark_menu_delegate.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_menu_delegate.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/utf_string_conversions.h"
8 #include "chrome/browser/bookmarks/bookmark_model.h" 8 #include "chrome/browser/bookmarks/bookmark_model.h"
9 #include "chrome/browser/bookmarks/bookmark_node_data.h" 9 #include "chrome/browser/bookmarks/bookmark_node_data.h"
10 #include "chrome/browser/bookmarks/bookmark_utils.h" 10 #include "chrome/browser/bookmarks/bookmark_utils.h"
(...skipping 405 matching lines...) Expand 10 before | Expand all | Expand 10 after
416 &added_separator); 416 &added_separator);
417 BuildMenuForPermanentNode(model->mobile_node(), menu, next_menu_id, 417 BuildMenuForPermanentNode(model->mobile_node(), menu, next_menu_id,
418 &added_separator); 418 &added_separator);
419 } 419 }
420 420
421 void BookmarkMenuDelegate::BuildMenuForPermanentNode( 421 void BookmarkMenuDelegate::BuildMenuForPermanentNode(
422 const BookmarkNode* node, 422 const BookmarkNode* node,
423 MenuItemView* menu, 423 MenuItemView* menu,
424 int* next_menu_id, 424 int* next_menu_id,
425 bool* added_separator) { 425 bool* added_separator) {
426 if (node->GetTotalNodeCount() == 1) 426 if (!node->IsVisible() || node->GetTotalNodeCount() == 1)
427 return; // No children, don't create a menu. 427 return; // No children, don't create a menu.
428 428
429 if (!*added_separator) { 429 if (!*added_separator) {
430 *added_separator = true; 430 *added_separator = true;
431 menu->AppendSeparator(); 431 menu->AppendSeparator();
432 } 432 }
433 int id = *next_menu_id; 433 int id = *next_menu_id;
434 (*next_menu_id)++; 434 (*next_menu_id)++;
435 SkBitmap* folder_icon = ResourceBundle::GetSharedInstance(). 435 SkBitmap* folder_icon = ResourceBundle::GetSharedInstance().
436 GetBitmapNamed(IDR_BOOKMARK_BAR_FOLDER); 436 GetBitmapNamed(IDR_BOOKMARK_BAR_FOLDER);
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
475 MenuItemView* BookmarkMenuDelegate::GetMenuByID(int id) { 475 MenuItemView* BookmarkMenuDelegate::GetMenuByID(int id) {
476 for (NodeToMenuMap::const_iterator i = node_to_menu_map_.begin(); 476 for (NodeToMenuMap::const_iterator i = node_to_menu_map_.begin();
477 i != node_to_menu_map_.end(); ++i) { 477 i != node_to_menu_map_.end(); ++i) {
478 MenuItemView* menu = i->second->GetMenuItemByID(id); 478 MenuItemView* menu = i->second->GetMenuItemByID(id);
479 if (menu) 479 if (menu)
480 return menu; 480 return menu;
481 } 481 }
482 482
483 return parent_menu_item_ ? parent_menu_item_->GetMenuItemByID(id) : NULL; 483 return parent_menu_item_ ? parent_menu_item_->GetMenuItemByID(id) : NULL;
484 } 484 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc ('k') | chrome/browser/ui/webui/ntp/bookmarks_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698