diff options
author | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 23:46:45 +0000 |
---|---|---|
committer | zea@chromium.org <zea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-10 23:46:45 +0000 |
commit | 786009d47328ac4672c86e5a3964d56fc36b3d74 (patch) | |
tree | e4994d54c0fac1f093200f08edeea4d1f4fc4170 /chrome/browser/search_engines/template_url_service.h | |
parent | 99800f2ad6f7518143b15092f711670253fbcfc8 (diff) | |
download | chromium_src-786009d47328ac4672c86e5a3964d56fc36b3d74.zip chromium_src-786009d47328ac4672c86e5a3964d56fc36b3d74.tar.gz chromium_src-786009d47328ac4672c86e5a3964d56fc36b3d74.tar.bz2 |
[Sync] Add location parameter to SyncChange in Sync API.
SyncChanges now require the location they were created as a parameter. This
is then used in the case that the change violates and invariant. We display
the location and type of erroneous change in about:sync, in addition to
disabling the offending datatype.
TBR=kalman@chromium.org, mnissler@chromium.org, isherman@chromium.org
BUG=135108
TEST=unit_tests
Review URL: https://chromiumcodereview.appspot.com/10766016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145993 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/search_engines/template_url_service.h')
-rw-r--r-- | chrome/browser/search_engines/template_url_service.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h index 5976224..e7472d1 100644 --- a/chrome/browser/search_engines/template_url_service.h +++ b/chrome/browser/search_engines/template_url_service.h @@ -292,7 +292,8 @@ class TemplateURLService : public WebDataServiceConsumer, // This may send a new SyncChange to the cloud. If our model has not yet been // associated with Sync, or if this is triggered by a Sync change, then this // does nothing. - void ProcessTemplateURLChange(const TemplateURL* turl, + void ProcessTemplateURLChange(const tracked_objects::Location& from_here, + const TemplateURL* turl, syncer::SyncChange::SyncChangeType type); Profile* profile() const { return profile_; } |