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

Unified Diff: chrome/browser/sync/syncable/syncable_id.h

Issue 7528026: sync: Put sqlite_utils.* into sqlite_utils namespace. (Closed) Base URL: svn://svn.chromium.org/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
« no previous file with comments | « chrome/browser/sync/syncable/directory_backing_store.cc ('k') | chrome/browser/sync/util/sqlite_utils.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/syncable/syncable_id.h
diff --git a/chrome/browser/sync/syncable/syncable_id.h b/chrome/browser/sync/syncable/syncable_id.h
index 316eb979728239b53d5e4eb9784ed2e3c152e3c7..5d82d7d4c5778aff2e113ca6967e4f8872f7ce27 100644
--- a/chrome/browser/sync/syncable/syncable_id.h
+++ b/chrome/browser/sync/syncable/syncable_id.h
@@ -13,18 +13,21 @@
#include "base/hash_tables.h"
+class MockConnectionManager;
+
namespace base {
class StringValue;
}
+namespace sqlite_utils {
+class SQLStatement;
+}
+
namespace syncable {
struct EntryKernel;
class Id;
}
-class MockConnectionManager;
-class SQLStatement;
-
namespace syncable {
std::ostream& operator<<(std::ostream& out, const Id& id);
@@ -40,12 +43,6 @@ std::ostream& operator<<(std::ostream& out, const Id& id);
// 2. r for the root item.
// 3. s<server provided opaque id> for items that the server knows about.
class Id {
- friend int UnpackEntry(SQLStatement* statement,
- syncable::EntryKernel** kernel);
- friend int BindFields(const EntryKernel& entry, SQLStatement* statement);
- friend std::ostream& operator<<(std::ostream& out, const Id& id);
- friend class MockConnectionManager;
- friend class SyncableIdTest;
public:
// This constructor will be handy even when we move away from int64s, just
// for unit tests.
@@ -115,6 +112,14 @@ class Id {
static Id GetLeastIdForLexicographicComparison();
private:
+ friend int UnpackEntry(sqlite_utils::SQLStatement* statement,
+ syncable::EntryKernel** kernel);
+ friend int BindFields(const EntryKernel& entry,
+ sqlite_utils::SQLStatement* statement);
+ friend std::ostream& operator<<(std::ostream& out, const Id& id);
+ friend class MockConnectionManager;
+ friend class SyncableIdTest;
+
std::string s_;
};
« no previous file with comments | « chrome/browser/sync/syncable/directory_backing_store.cc ('k') | chrome/browser/sync/util/sqlite_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698