Splits shelf alignment and auto-hide behavior into two values, one

chrome/browser/prefs/pref_model_associator.cc

 // Copyright (c) 2012 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_string_value_serializer.h"
 #include "base/location.h"
@@ skipping 146 matching lines @@
   }
 
   // Push updates to sync.
   syncer::SyncError error =
       sync_processor_->ProcessSyncChanges(FROM_HERE, new_changes);
   if (error.IsSet()) {
     return error;
   }
 
   models_associated_ = true;
+  pref_service_->HasSyncedChanged();
   return syncer::SyncError();
 }
 
 void PrefModelAssociator::StopSyncing(syncer::ModelType type) {
   DCHECK_EQ(type, PREFERENCES);
   models_associated_ = false;
   sync_processor_.reset();
   sync_error_factory_.reset();
+  pref_service_->HasSyncedChanged();
 }
 
 Value* PrefModelAssociator::MergePreference(
     const PrefService::Preference& local_pref,
     const Value& server_value) {
   const std::string& name(local_pref.name());
   if (name == prefs::kURLsToRestoreOnStartup ||
       name == prefs::kDesktopNotificationAllowedOrigins ||
       name == prefs::kDesktopNotificationDeniedOrigins) {
     return MergeListValues(*local_pref.GetValue(), server_value);
@@ skipping 253 matching lines @@
   }
 
   syncer::SyncError error =
       sync_processor_->ProcessSyncChanges(FROM_HERE, changes);
 }
 
 void PrefModelAssociator::SetPrefService(PrefService* pref_service) {
   DCHECK(pref_service_ == NULL);
   pref_service_ = pref_service;
 }