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

Unified Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm

Issue 8759017: BookmarkModel cleanup. synced_node is now mobile_node and I'm nuking (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk fix sync_integration_tests and extension test Created 9 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
index 86498e828d792c03ad9b34689fd1aad815c61392..de93d0db5676105b895b71789cf3ebf15918d639 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm
@@ -537,11 +537,8 @@ void RecordAppLaunch(Profile* profile, GURL url) {
}
- (BOOL)canEditBookmark:(const BookmarkNode*)node {
- // Don't allow edit/delete of the bar node, or of "Other Bookmarks"
- if (node == nil ||
- node == bookmarkModel_->bookmark_bar_node() ||
- node == bookmarkModel_->other_node() ||
- node == bookmarkModel_->synced_node())
+ // Don't allow edit/delete of the permanent nodes.
+ if (node == nil || bookmarkModel_->is_permanent_node(node))
return NO;
return YES;
}
@@ -799,7 +796,7 @@ void RecordAppLaunch(Profile* profile, GURL url) {
BookmarkNode::Type type = senderNode->type();
if (type == BookmarkNode::BOOKMARK_BAR ||
type == BookmarkNode::OTHER_NODE ||
- type == BookmarkNode::SYNCED ||
+ type == BookmarkNode::MOBILE ||
type == BookmarkNode::FOLDER) {
parent = senderNode;
newIndex = parent->child_count();

Powered by Google App Engine
This is Rietveld 408576698