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

Side by Side Diff: chrome/browser/sync/syncable/syncable.h

Issue 273058: Fix some warnings on Mac that are treated as errors:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ 5 #ifndef CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_
6 #define CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ 6 #define CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_
7 7
8 #include <algorithm> 8 #include <algorithm>
9 #include <bitset> 9 #include <bitset>
10 #include <iosfwd> 10 #include <iosfwd>
(...skipping 821 matching lines...) Expand 10 before | Expand all | Expand 10 after
832 friend class BaseTransaction; 832 friend class BaseTransaction;
833 friend class Entry; 833 friend class Entry;
834 friend class ExtendedAttribute; 834 friend class ExtendedAttribute;
835 friend class MutableEntry; 835 friend class MutableEntry;
836 friend class MutableExtendedAttribute; 836 friend class MutableExtendedAttribute;
837 friend class ReadTransaction; 837 friend class ReadTransaction;
838 friend class ReadTransactionWithoutDB; 838 friend class ReadTransactionWithoutDB;
839 friend class ScopedKernelLock; 839 friend class ScopedKernelLock;
840 friend class ScopedKernelUnlock; 840 friend class ScopedKernelUnlock;
841 friend class WriteTransaction; 841 friend class WriteTransaction;
842 friend class TestUnsaveableDirectory;
843 public: 842 public:
844 // Various data that the Directory::Kernel we are backing (persisting data 843 // Various data that the Directory::Kernel we are backing (persisting data
845 // for) needs saved across runs of the application. 844 // for) needs saved across runs of the application.
846 struct PersistedKernelInfo { 845 struct PersistedKernelInfo {
847 int64 last_sync_timestamp; 846 int64 last_sync_timestamp;
848 bool initial_sync_ended; 847 bool initial_sync_ended;
849 std::string store_birthday; 848 std::string store_birthday;
850 int64 next_id; 849 int64 next_id;
851 PersistedKernelInfo() : last_sync_timestamp(0), 850 PersistedKernelInfo() : last_sync_timestamp(0),
852 initial_sync_ended(false), 851 initial_sync_ended(false),
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
1317 void ZeroFields(EntryKernel* entry, int first_field); 1316 void ZeroFields(EntryKernel* entry, int first_field);
1318 1317
1319 } // namespace syncable 1318 } // namespace syncable
1320 1319
1321 std::ostream& operator <<(std::ostream&, const syncable::Blob&); 1320 std::ostream& operator <<(std::ostream&, const syncable::Blob&);
1322 1321
1323 browser_sync::FastDump& operator << 1322 browser_sync::FastDump& operator <<
1324 (browser_sync::FastDump&, const syncable::Blob&); 1323 (browser_sync::FastDump&, const syncable::Blob&);
1325 1324
1326 #endif // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_ 1325 #endif // CHROME_BROWSER_SYNC_SYNCABLE_SYNCABLE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698