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

Side by Side Diff: sync/internal_api/public/delete_journal.h

Issue 906403003: Revert of Use external ID to match native model nodes during bookmark association. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 unified diff | Download patch
« no previous file with comments | « sync/internal_api/delete_journal.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef SYNC_INTERNAL_API_PUBLIC_DELETE_JOURNAL_H_ 5 #ifndef SYNC_INTERNAL_API_PUBLIC_DELETE_JOURNAL_H_
6 #define SYNC_INTERNAL_API_PUBLIC_DELETE_JOURNAL_H_ 6 #define SYNC_INTERNAL_API_PUBLIC_DELETE_JOURNAL_H_
7 7
8 #include <vector> 8 #include <vector>
9 9
10 #include "sync/base/sync_export.h" 10 #include "sync/base/sync_export.h"
11 #include "sync/internal_api/public/base/model_type.h" 11 #include "sync/internal_api/public/base/model_type.h"
12 #include "sync/protocol/sync.pb.h" 12 #include "sync/protocol/sync.pb.h"
13 13
14 namespace syncer { 14 namespace syncer {
15 15
16 class BaseTransaction; 16 class BaseTransaction;
17 17
18 struct BookmarkDeleteJournal { 18 struct BookmarkDeleteJournal {
19 int64 id; // Metahandle of delete journal entry. 19 int64 id; // Metahandle of delete journal entry.
20 int64 external_id; // Bookmark ID in the native model.
21 bool is_folder; 20 bool is_folder;
22 sync_pb::EntitySpecifics specifics; 21 sync_pb::EntitySpecifics specifics;
23 }; 22 };
24 typedef std::vector<BookmarkDeleteJournal> BookmarkDeleteJournalList; 23 typedef std::vector<BookmarkDeleteJournal> BookmarkDeleteJournalList;
25 24
26 // Static APIs for passing delete journals between syncer::syncable namspace 25 // Static APIs for passing delete journals between syncer::syncable namspace
27 // and syncer namespace. 26 // and syncer namespace.
28 class SYNC_EXPORT DeleteJournal { 27 class SYNC_EXPORT DeleteJournal {
29 public: 28 public:
30 // Return info about deleted bookmark entries stored in the delete journal 29 // Return info about deleted bookmark entries stored in the delete journal
31 // of |trans|'s directory. 30 // of |trans|'s directory.
32 // TODO(haitaol): remove this after SyncData supports bookmarks and 31 // TODO(haitaol): remove this after SyncData supports bookmarks and
33 // all types of delete journals can be returned as 32 // all types of delete journals can be returned as
34 // SyncDataList. 33 // SyncDataList.
35 static void GetBookmarkDeleteJournals( 34 static void GetBookmarkDeleteJournals(
36 BaseTransaction* trans, BookmarkDeleteJournalList *delete_journals); 35 BaseTransaction* trans, BookmarkDeleteJournalList *delete_journals);
37 36
38 // Purge delete journals of given IDs from |trans|'s directory. 37 // Purge delete journals of given IDs from |trans|'s directory.
39 static void PurgeDeleteJournals(BaseTransaction* trans, 38 static void PurgeDeleteJournals(BaseTransaction* trans,
40 const std::set<int64>& ids); 39 const std::set<int64>& ids);
41 }; 40 };
42 41
43 } // namespace syncer 42 } // namespace syncer
44 43
45 #endif // SYNC_INTERNAL_API_PUBLIC_DELETE_JOURNAL_H_ 44 #endif // SYNC_INTERNAL_API_PUBLIC_DELETE_JOURNAL_H_
OLDNEW
« no previous file with comments | « sync/internal_api/delete_journal.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698