chrome/browser/extensions/extension_bookmark_helpers.cc - Issue 7003039: ui/base/models: Add empty() accessor to TreeNode class.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/extension_bookmark_helpers.cc

Issue 7003039: ui/base/models: Add empty() accessor to TreeNode class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sky review Created 9 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/extensions/extension_bookmark_helpers.cc

diff --git a/chrome/browser/extensions/extension_bookmark_helpers.cc b/chrome/browser/extensions/extension_bookmark_helpers.cc

index 36b6a73ae5a173724015c22e88a1a9e7a507ca49..8b2e9a4cb35ba66aa1a817a8d8367845c05b3649 100644

--- a/chrome/browser/extensions/extension_bookmark_helpers.cc

+++ b/chrome/browser/extensions/extension_bookmark_helpers.cc

@@ -99,7 +99,7 @@ bool RemoveNode(BookmarkModel* model,

*error = keys::kModifySpecialError;

return false;

}

- if (node->is_folder() && node->child_count() > 0 && !recursive) {

+ if (node->is_folder() && !node->empty() && !recursive) {

*error = keys::kFolderNotEmptyError;

return false;

}

« no previous file with comments | « chrome/browser/cookies_tree_model.cc ('k') | chrome/browser/importer/profile_writer.cc » ('j') | no next file with comments »