Revert "Revert 84829 - Initial implementation of "Synced Bookmarks" folder."

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/history/history.h"
 #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"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "views/background.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/label.h"
@@ skipping 451 matching lines @@
   if (!b_node)
     b_node = tree_model_->GetRoot()->GetChild(0);  // Bookmark bar node.
 
   tree_view_->SetSelectedNode(b_node);
 }
 
 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);

[Yaron, 2011/05/12 00:39:55]

Are we concerned about the case of you going back in time with your chrome? So
namely if the flag becomes unset after it was once set, this could be wrong.
Should I assert that it's >= 2 and <= 3?

[sky, 2011/05/12 15:37:19]

We generally show a warning to the user if they attempt to move a profile from
an older version to a newer version. As far as I know each subsystem that cares
shows a warning. Try opening the latest version of chrome then an earlier
version, say 10, to see the warning.

[Yaron, 2011/05/12 18:19:22]

I see. Well, I changed it to allow 2-3 or nodes which  seems strictly safer. I'm
trying to make the flag control simply whether the synced bookmarks are visible
in the ui, but in the model you could have 3 even if the flag is unset.
Actually, in that case, should I add a guard to CreateNodes to only add Synced
if the command line flag is set?

+    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;
 }
 
 void BookmarkEditorView::CreateNodes(const BookmarkNode* bb_node,
                                      BookmarkEditorView::EditorNode* b_node) {
   for (int i = 0; i < bb_node->child_count(); ++i) {
     const BookmarkNode* child_bb_node = bb_node->GetChild(i);
     if (child_bb_node->is_folder()) {
       EditorNode* new_b_node =
           new EditorNode(WideToUTF16(child_bb_node->GetTitle()),
@@ skipping 79 matching lines @@
           break;
         }
       }
       DCHECK(child_bb_node);
       bb_model_->SetTitle(child_bb_node, child_b_node->GetTitle());
     }
     ApplyNameChangesAndCreateNewFolders(child_bb_node, child_b_node,
                                         parent_b_node, parent_bb_node);
   }
 }