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

Unified Diff: chrome/browser/sync/glue/typed_url_model_associator.h

Issue 7605019: Reduce number of unnamed-type-template-args violations. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 4 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/sync/glue/typed_url_model_associator.h
===================================================================
--- chrome/browser/sync/glue/typed_url_model_associator.h (revision 98479)
+++ chrome/browser/sync/glue/typed_url_model_associator.h (working copy)
@@ -105,36 +105,36 @@
const history::VisitVector* deleted_visits);
// Bitfield returned from MergeUrls to specify the result of the merge.
- enum {
+ enum MergeResult {
// No changes were noted.
- DIFF_NONE = 0x0000,
+ DIFF_NONE = 0x0000,
// The local sync node needs to be modified.
- DIFF_UPDATE_NODE = 0x0001,
+ DIFF_UPDATE_NODE = 0x0001,
// The title changed in the local URLRow. DIFF_ROW_CHANGED will also be set
// if this is set.
- DIFF_LOCAL_TITLE_CHANGED = 0x0002,
+ DIFF_LOCAL_TITLE_CHANGED = 0x0002,
// The local URLRow has changed (typed_count, visit_count, title, etc).
- DIFF_LOCAL_ROW_CHANGED = 0x0004,
+ DIFF_LOCAL_ROW_CHANGED = 0x0004,
// Visits need to be added to the local URLRow.
- DIFF_LOCAL_VISITS_ADDED = 0x0008,
+ DIFF_LOCAL_VISITS_ADDED = 0x0008,
};
// Merges the URL information in |typed_url| with the URL information from the
// history database in |url| and |visits|, and returns a bitmask with the
// results of the merge:
- // DIFF_NODE_CHANGE - changes have been made to |new_url| and |visits| which
+ // DIFF_UPDATE_NODE - changes have been made to |new_url| and |visits| which
// should be persisted to the sync node.
- // DIFF_TITLE_CHANGED - The title has changed, so the title in |new_url|
+ // DIFF_LOCAL_TITLE_CHANGED - The title has changed, so the title in |new_url|
// should be persisted to the history DB.
- // DIFF_ROW_CHANGED - The history data in |new_url| should be persisted to the
- // history DB.
- // DIFF_VISITS_ADDED - |new_visits| contains a list of visits that should be
- // written to the history DB for this URL. Deletions are not written to the
- // DB - each client is left to age out visits on their own.
+ // DIFF_LOCAL_ROW_CHANGED - The history data in |new_url| should be persisted
+ // to the history DB.
+ // DIFF_LOCAL_VISITS_ADDED - |new_visits| contains a list of visits that
+ // should be written to the history DB for this URL. Deletions are not
+ // written to the DB - each client is left to age out visits on their own.
static int MergeUrls(const sync_pb::TypedUrlSpecifics& typed_url,
const history::URLRow& url,
history::VisitVector* visits,

Powered by Google App Engine
This is Rietveld 408576698