| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_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 #include "content/common/notification_service.h" | |
| 19 | 18 |
| 20 using syncable::PREFERENCES; | 19 using syncable::PREFERENCES; |
| 21 | 20 |
| 22 PrefModelAssociator::PrefModelAssociator() | 21 PrefModelAssociator::PrefModelAssociator() |
| 23 : models_associated_(false), | 22 : models_associated_(false), |
| 24 processing_syncer_changes_(false), | 23 processing_syncer_changes_(false), |
| 25 pref_service_(NULL), | 24 pref_service_(NULL), |
| 26 sync_processor_(NULL) { | 25 sync_processor_(NULL) { |
| 27 } | 26 } |
| 28 | 27 |
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 424 return; | 423 return; |
| 425 } | 424 } |
| 426 changes.push_back(SyncChange(SyncChange::ACTION_UPDATE, sync_data)); | 425 changes.push_back(SyncChange(SyncChange::ACTION_UPDATE, sync_data)); |
| 427 } | 426 } |
| 428 | 427 |
| 429 SyncError error = | 428 SyncError error = |
| 430 sync_processor_->ProcessSyncChanges(FROM_HERE, changes); | 429 sync_processor_->ProcessSyncChanges(FROM_HERE, changes); |
| 431 if (error.IsSet()) | 430 if (error.IsSet()) |
| 432 StopSyncing(PREFERENCES); | 431 StopSyncing(PREFERENCES); |
| 433 } | 432 } |
| OLD | NEW |