Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2826)

Unified Diff: chrome/browser/prefs/pref_model_associator.cc

Issue 10690128: Reland r145993. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/prefs/pref_model_associator.cc
diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc
index 0ed80e16ec6ed831e8ea51718d2e495b614b15c6..5edab2558daa0c3e3a8870d14943ba2feada3484 100644
--- a/chrome/browser/prefs/pref_model_associator.cc
+++ b/chrome/browser/prefs/pref_model_associator.cc
@@ -80,7 +80,9 @@ void PrefModelAssociator::InitPrefAndAssociate(
return;
}
sync_changes->push_back(
- syncer::SyncChange(syncer::SyncChange::ACTION_UPDATE, sync_data));
+ syncer::SyncChange(FROM_HERE,
+ syncer::SyncChange::ACTION_UPDATE,
+ sync_data));
}
} else if (pref->IsUserControlled()) {
// The server does not know about this preference and should be added
@@ -91,7 +93,9 @@ void PrefModelAssociator::InitPrefAndAssociate(
return;
}
sync_changes->push_back(
- syncer::SyncChange(syncer::SyncChange::ACTION_ADD, sync_data));
+ syncer::SyncChange(FROM_HERE,
+ syncer::SyncChange::ACTION_ADD,
+ sync_data));
} else {
// This pref does not have a sync value but also does not have a user
// controlled value (either it's a default value or it's policy controlled,
@@ -428,7 +432,9 @@ void PrefModelAssociator::ProcessPrefChange(const std::string& name) {
return;
}
changes.push_back(
- syncer::SyncChange(syncer::SyncChange::ACTION_UPDATE, sync_data));
+ syncer::SyncChange(FROM_HERE,
+ syncer::SyncChange::ACTION_UPDATE,
+ sync_data));
}
syncer::SyncError error =
« no previous file with comments | « chrome/browser/extensions/settings/settings_sync_util.cc ('k') | chrome/browser/search_engines/template_url_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698