Fixed behavior of the bookmark bar visibility.

chrome/browser/bookmarks/bookmark_model.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/bookmarks/bookmark_model.h"
 
 #include <algorithm>
 #include <functional>
 
 #include "base/callback.h"
@@ skipping 106 matching lines @@
       root_(GURL()),
       bookmark_bar_node_(NULL),
       other_node_(NULL),
       synced_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());
+  } else {
+    pref_change_registrar_.Init(profile_->GetPrefs());
+    pref_change_registrar_.Add(prefs::kShowBookmarkBar, this);
   }
 }
 
 BookmarkModel::~BookmarkModel() {
   FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
                     BookmarkModelBeingDeleted(this));
 
   if (store_) {
     // The store maintains a reference back to us. We need to tell it we're gone
     // so that it doesn't try and invoke a method back on us again.
@@ skipping 648 matching lines @@
           BookmarkNode* node = AsMutable(nodes[i]);
           node->InvalidateFavicon();
           CancelPendingFaviconLoadRequests(node);
           FOR_EACH_OBSERVER(BookmarkModelObserver, observers_,
                             BookmarkNodeFaviconChanged(this, node));
         }
       }
       break;
     }
 
+    case chrome::NOTIFICATION_PREF_CHANGED: {

[sky, 2011/10/05 16:59:12]

In theory there need not be a bookmarkmodel created when this pref changes.

It seems weird to listen for a pref change then turn around and fire another
notification. Can the observers listen directly for kShowBookmarkBar and we get
rid of NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED?

[Joao da Silva, 2011/10/06 19:45:38]

I thought of that but felt lazy :-) It's been done now.

+      std::string* pref = Details<std::string>(details).ptr();
+      if (*pref == prefs::kShowBookmarkBar) {
+        Source<Profile> source(profile_);
+        NotificationService::current()->Notify(
+            chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
+            source,
+            NotificationService::NoDetails());
+      } else {
+        NOTREACHED();
+      }
+      break;
+    }
+
     default:
       NOTREACHED();
       break;
   }
 }
 
 void BookmarkModel::PopulateNodesByURL(BookmarkNode* node) {
   // NOTE: this is called with url_lock_ already held. As such, this doesn't
   // explicitly grab the lock.
   if (node->is_url())
@@ skipping 10 matching lines @@
   file_changed_ = true;
 }
 
 BookmarkLoadDetails* BookmarkModel::CreateLoadDetails() {
   BookmarkNode* bb_node = CreatePermanentNode(BookmarkNode::BOOKMARK_BAR);
   BookmarkNode* other_node = CreatePermanentNode(BookmarkNode::OTHER_NODE);
   BookmarkNode* synced_node = CreatePermanentNode(BookmarkNode::SYNCED);
   return new BookmarkLoadDetails(bb_node, other_node, synced_node,
                                  new BookmarkIndex(profile_), next_node_id_);
 }