We need to save bookmarks file when the persist_ids settings changes...

chrome/browser/bookmarks/bookmark_model.cc

 // Copyright (c) 2006-2008 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/bookmarks/bookmark_model.h"
 
 #include "app/l10n_util.h"
 #include "base/gfx/png_decoder.h"
 #include "base/scoped_vector.h"
 #include "build/build_config.h"
@@ skipping 71 matching lines @@
  private:
   Collator* collator_;
 };
 
 }  // namespace
 
 BookmarkModel::BookmarkModel(Profile* profile)
     : profile_(profile),
       loaded_(false),
       persist_ids_(false),
+      file_changed_(false),
       root_(GURL()),
       bookmark_bar_node_(NULL),
       other_node_(NULL),
       next_node_id_(1),
       observers_(ObserverList<BookmarkModelObserver>::NOTIFY_EXISTING_ONLY),
       loaded_signal_(TRUE, FALSE) {
   if (!profile_) {
     // Profile is null during testing.
     DoneLoading(CreateLoadDetails());
   }
@@ skipping 283 matching lines @@
 }
 
 void BookmarkModel::SetPersistIDs(bool value) {
   if (value == persist_ids_)
     return;
   persist_ids_ = value;
   if (profile_) {
     PrefService* pref_service = profile_->GetPrefs();
     pref_service->SetBoolean(kPrefPersistIDs, persist_ids_);
   }
+  // Need to save the bookmark data if the value of persist IDs changes.
+  if (store_.get())
+    store_->ScheduleSave();
 }
 
 bool BookmarkModel::IsBookmarkedNoLock(const GURL& url) {
   BookmarkNode tmp_node(url);
   return (nodes_ordered_by_url_set_.find(&tmp_node) !=
           nodes_ordered_by_url_set_.end());
 }
 
 void BookmarkModel::FavIconLoaded(BookmarkNode* node) {
   // Send out notification to the observer.
@@ skipping 37 matching lines @@
   scoped_ptr<BookmarkStorage::LoadDetails> details(details_delete_me);
   if (loaded_) {
     // We should only ever be loaded once.
     NOTREACHED();
     return;
   }
 
   bookmark_bar_node_ = details->bb_node();
   other_node_ = details->other_folder_node();
   next_node_id_ = details->max_id();
+  if (details->computed_checksum() != details->stored_checksum())
+    SetFileChanged();
   index_.reset(details->index());
   details->release();
 
   // WARNING: order is important here, various places assume bookmark bar then
   // other node.
   root_.Add(0, bookmark_bar_node_);
   root_.Add(1, other_node_);
 
   {
     AutoLock url_lock(url_lock_);
@@ skipping 231 matching lines @@
   if (node->is_url())
     nodes_ordered_by_url_set_.insert(node);
   for (int i = 0; i < node->GetChildCount(); ++i)
     PopulateNodesByURL(node->GetChild(i));
 }
 
 int BookmarkModel::generate_next_node_id() {
   return next_node_id_++;
 }
 
+void BookmarkModel::SetFileChanged() {
+  file_changed_ = true;
+  // If bookmarks file changed externally, the IDs may have changed externally.
+  // in that case, the decoder may have reassigned IDs to make them unique.
+  // So when the file has changed externally and IDs are persisted, we should
+  // save the bookmarks file to persist new IDs.
+  if (persist_ids_ && store_.get())
+    store_->ScheduleSave();
+}
+
 BookmarkStorage::LoadDetails* BookmarkModel::CreateLoadDetails() {
   BookmarkNode* bb_node = CreateBookmarkNode();
   BookmarkNode* other_folder_node = CreateOtherBookmarksNode();
   return new BookmarkStorage::LoadDetails(
       bb_node, other_folder_node, new BookmarkIndex(), next_node_id_);
 }
 
 void BookmarkModel::RegisterPreferences() {
   if (!profile_)
     return;
   PrefService* pref_service = profile_->GetPrefs();
   if (!pref_service->IsPrefRegistered(kPrefPersistIDs))
     pref_service->RegisterBooleanPref(kPrefPersistIDs, false);
 }
 
 void BookmarkModel::LoadPreferences() {
   if (!profile_)
     return;
   PrefService* pref_service = profile_->GetPrefs();
   persist_ids_ = pref_service->GetBoolean(kPrefPersistIDs);
 }