chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc - Issue 7012005: Revert "Revert 84829 - Initial implementation of "Synced Bookmarks" folder."

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/ui/views/bookmarks/bookmark_editor_view.cc

Issue 7012005: Revert "Revert 84829 - Initial implementation of "Synced Bookmarks" folder." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Slight tweak to starred_url_database to make sync come after other Created 9 years, 7 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:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/history/starred_url_database.cc ('K') | « chrome/browser/ui/gtk/bookmarks/bookmark_editor_gtk_unittest.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc

diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc

index b8e25efee8cd6f9e592b47ab42fca38ca27a7517..7bade19c8507f9fad539ebf4c41237ca095dcc28 100644

--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc

+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc

@@ -5,6 +5,7 @@

#include "chrome/browser/ui/views/bookmarks/bookmark_editor_view.h"

#include "base/basictypes.h"

+#include "base/command_line.h"

#include "base/logging.h"

#include "base/string_util.h"

#include "base/utf_string_conversions.h"

@@ -14,6 +15,7 @@

#include "chrome/browser/net/url_fixer_upper.h"

#include "chrome/browser/prefs/pref_service.h"

#include "chrome/browser/profiles/profile.h"

+#include "chrome/common/chrome_switches.h"

#include "chrome/common/pref_names.h"

#include "googleurl/src/gurl.h"

#include "grit/chromium_strings.h"

@@ -485,9 +487,17 @@ BookmarkEditorView::EditorNode* BookmarkEditorView::CreateRootNode() {

EditorNode* root_node = new EditorNode(std::wstring(), 0);

const BookmarkNode* bb_root_node = bb_model_->root_node();

CreateNodes(bb_root_node, root_node);

- DCHECK(root_node->child_count() == 2);

- DCHECK(bb_root_node->GetChild(0)->type() == BookmarkNode::BOOKMARK_BAR);

- DCHECK(bb_root_node->GetChild(1)->type() == BookmarkNode::OTHER_NODE);

+ if (CommandLine::ForCurrentProcess()->HasSwitch(

+ switches::kEnableSyncedBookmarksFolder)) {

+ DCHECK(root_node->child_count() == 3);

+ DCHECK(bb_root_node->GetChild(0)->type() == BookmarkNode::BOOKMARK_BAR);

+ DCHECK(bb_root_node->GetChild(1)->type() == BookmarkNode::OTHER_NODE);

+ DCHECK(bb_root_node->GetChild(2)->type() == BookmarkNode::SYNCED);

+ } else {

+ DCHECK(root_node->child_count() == 2);

+ DCHECK(bb_root_node->GetChild(0)->type() == BookmarkNode::BOOKMARK_BAR);

+ DCHECK(bb_root_node->GetChild(1)->type() == BookmarkNode::OTHER_NODE);

+ }

return root_node;

}