Fixed behavior of the bookmark bar visibility.

chrome/browser/prefs/pref_model_associator.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/prefs/pref_model_associator.h"
 
 #include "base/auto_reset.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_value_serializer.h"
 #include "base/location.h"
@@ skipping 64 matching lines @@
     if (new_value->IsType(Value::TYPE_NULL)) {
       pref_service_->ClearPref(pref_name.c_str());
     } else if (!new_value->IsType(pref->GetType())) {
       LOG(WARNING) << "Synced value for " << preference.name()
                    << " is of type " << new_value->GetType()
                    << " which doesn't match pref type " << pref->GetType();
     } else if (!pref->GetValue()->Equals(new_value.get())) {
       pref_service_->Set(pref_name.c_str(), *new_value);
     }
 
-    SendUpdateNotificationsIfNecessary(pref_name);
-
     // If the merge resulted in an updated value, inform the syncer.
     if (!value->Equals(new_value.get())) {
       SyncData sync_data;
       if (!CreatePrefSyncData(pref->name(), *new_value, &sync_data)) {
         LOG(ERROR) << "Failed to update preference.";
         return;
       }
       sync_changes->push_back(SyncChange(SyncChange::ACTION_UPDATE, sync_data));
     }
   } else if (pref->IsUserControlled()) {
@@ skipping 169 matching lines @@
       }
       // Note that for all other types we want to preserve the "to"
       // values so we do nothing here.
     } else {
       result->SetWithoutPathExpansion(*key, from_value->DeepCopy());
     }
   }
   return result;
 }
 
-void PrefModelAssociator::SendUpdateNotificationsIfNecessary(
-    const std::string& pref_name) {
-  // The bookmark bar visibility preference requires a special
-  // notification to update the UI.
-  if (0 == pref_name.compare(prefs::kShowBookmarkBar)) {
-    NotificationService::current()->Notify(
-        chrome::NOTIFICATION_BOOKMARK_BAR_VISIBILITY_PREF_CHANGED,
-        Source<PrefModelAssociator>(this),
-        NotificationService::NoDetails());
-  }
-}
-
 // Note: This will build a model of all preferences registered as syncable
 // with user controlled data. We do not track any information for preferences
 // not registered locally as syncable and do not inform the syncer of
 // non-user controlled preferences.
 SyncDataList PrefModelAssociator::GetAllSyncData(syncable::ModelType type)
     const {
   DCHECK_EQ(PREFERENCES, type);
   SyncDataList current_data;
   for (PreferenceSet::const_iterator iter = synced_preferences_.begin();
        iter != synced_preferences_.end();
@@ skipping 60 matching lines @@
 
     // This will only modify the user controlled value store, which takes
     // priority over the default value but is ignored if the preference is
     // policy controlled.
     pref_service_->Set(pref_name, *value);
 
     // Keep track of any newly synced preferences.
     if (iter->change_type() == SyncChange::ACTION_ADD) {
       synced_preferences_.insert(name);
     }
-
-    SendUpdateNotificationsIfNecessary(name);
   }
   return SyncError();
 }
 
 Value* PrefModelAssociator::ReadPreferenceSpecifics(
     const sync_pb::PreferenceSpecifics& preference,
     std::string* name) {
   base::JSONReader reader;
   scoped_ptr<Value> value(reader.JsonToValue(preference.value(), false, false));
   if (!value.get()) {
@@ skipping 61 matching lines @@
       return;
     }
     changes.push_back(SyncChange(SyncChange::ACTION_UPDATE, sync_data));
   }
 
   SyncError error =
       sync_processor_->ProcessSyncChanges(FROM_HERE, changes);
   if (error.IsSet())
     StopSyncing(PREFERENCES);
 }