| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "chrome/browser/prefs/pref_model_associator.h" | 5 #include "chrome/browser/prefs/pref_model_associator.h" |
| 6 | 6 |
| 7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
| 8 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
| 9 #include "base/json/json_value_serializer.h" | 9 #include "base/json/json_string_value_serializer.h" |
| 10 #include "base/location.h" | 10 #include "base/location.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/utf_string_conversions.h" | 12 #include "base/utf_string_conversions.h" |
| 13 #include "base/values.h" | 13 #include "base/values.h" |
| 14 #include "chrome/browser/sync/api/sync_change.h" | 14 #include "chrome/browser/sync/api/sync_change.h" |
| 15 #include "chrome/browser/sync/protocol/preference_specifics.pb.h" | 15 #include "chrome/browser/sync/protocol/preference_specifics.pb.h" |
| 16 #include "chrome/common/chrome_notification_types.h" | 16 #include "chrome/common/chrome_notification_types.h" |
| 17 #include "chrome/common/pref_names.h" | 17 #include "chrome/common/pref_names.h" |
| 18 | 18 |
| 19 using syncable::PREFERENCES; | 19 using syncable::PREFERENCES; |
| (...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 427 SyncError error = | 427 SyncError error = |
| 428 sync_processor_->ProcessSyncChanges(FROM_HERE, changes); | 428 sync_processor_->ProcessSyncChanges(FROM_HERE, changes); |
| 429 if (error.IsSet()) | 429 if (error.IsSet()) |
| 430 StopSyncing(PREFERENCES); | 430 StopSyncing(PREFERENCES); |
| 431 } | 431 } |
| 432 | 432 |
| 433 void PrefModelAssociator::SetPrefService(PrefService* pref_service) { | 433 void PrefModelAssociator::SetPrefService(PrefService* pref_service) { |
| 434 DCHECK(pref_service_ == NULL); | 434 DCHECK(pref_service_ == NULL); |
| 435 pref_service_ = pref_service; | 435 pref_service_ = pref_service; |
| 436 } | 436 } |
| OLD | NEW |