summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync
diff options
context:
space:
mode:
authorstevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-17 20:03:01 +0000
committerstevet@chromium.org <stevet@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-17 20:03:01 +0000
commitd88cb208856c38577a2c045b7bd08f0f4fe6b285 (patch)
tree6a6832487abc7312a31e74d4d3972562569c0574 /chrome/browser/sync
parent4c9ee221ac11f509db94c568d7e542ac8a3fc583 (diff)
downloadchromium_src-d88cb208856c38577a2c045b7bd08f0f4fe6b285.zip
chromium_src-d88cb208856c38577a2c045b7bd08f0f4fe6b285.tar.gz
chromium_src-d88cb208856c38577a2c045b7bd08f0f4fe6b285.tar.bz2
Recommitting what was r96969. Fixed the memory leak issues.
Implement SyncableServices in TemplateURLService. Add related unittests. TEST=Ensure all TemplateURLService related unit tests pass. Ensure the HeapBots are happy! BUG=15548 Review URL: http://codereview.chromium.org/7566036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@97187 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r--chrome/browser/sync/api/sync_change.cc17
-rw-r--r--chrome/browser/sync/api/sync_change.h3
2 files changed, 20 insertions, 0 deletions
diff --git a/chrome/browser/sync/api/sync_change.cc b/chrome/browser/sync/api/sync_change.cc
index dcf5328..afd321d 100644
--- a/chrome/browser/sync/api/sync_change.cc
+++ b/chrome/browser/sync/api/sync_change.cc
@@ -42,3 +42,20 @@ SyncChange::SyncChangeType SyncChange::change_type() const {
SyncData SyncChange::sync_data() const {
return sync_data_;
}
+
+// static
+std::string SyncChange::ChangeTypeToString(SyncChangeType change_type) {
+ switch (change_type) {
+ case ACTION_INVALID:
+ return "ACTION_INVALID";
+ case ACTION_ADD:
+ return "ACTION_ADD";
+ case ACTION_UPDATE:
+ return "ACTION_UPDATE";
+ case ACTION_DELETE:
+ return "ACTION_DELETE";
+ default:
+ NOTREACHED();
+ }
+ return std::string();
+}
diff --git a/chrome/browser/sync/api/sync_change.h b/chrome/browser/sync/api/sync_change.h
index 0c29cc7..f2bc40e 100644
--- a/chrome/browser/sync/api/sync_change.h
+++ b/chrome/browser/sync/api/sync_change.h
@@ -45,6 +45,9 @@ class SyncChange {
SyncChangeType change_type() const;
SyncData sync_data() const;
+ // Returns a string representation of |change_type|.
+ static std::string ChangeTypeToString(SyncChangeType change_type);
+
private:
SyncChangeType change_type_;