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

Side by Side Diff: content/browser/indexed_db/indexed_db_metadata.h

Issue 475063004: IndexedDB + Coding Style: re-order enums/typedefs/... to match guide (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased after r291485 Created 6 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_METADATA_H_ 5 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_METADATA_H_
6 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_METADATA_H_ 6 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_METADATA_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/basictypes.h" 10 #include "base/basictypes.h"
11 #include "base/strings/string16.h" 11 #include "base/strings/string16.h"
12 #include "content/common/indexed_db/indexed_db_key_path.h" 12 #include "content/common/indexed_db/indexed_db_key_path.h"
13 13
14 namespace content { 14 namespace content {
15 15
16 struct IndexedDBIndexMetadata { 16 struct IndexedDBIndexMetadata {
17 static const int64 kInvalidId = -1;
18
17 IndexedDBIndexMetadata() {} 19 IndexedDBIndexMetadata() {}
18 IndexedDBIndexMetadata(const base::string16& name, 20 IndexedDBIndexMetadata(const base::string16& name,
19 int64 id, 21 int64 id,
20 const IndexedDBKeyPath& key_path, 22 const IndexedDBKeyPath& key_path,
21 bool unique, 23 bool unique,
22 bool multi_entry) 24 bool multi_entry)
23 : name(name), 25 : name(name),
24 id(id), 26 id(id),
25 key_path(key_path), 27 key_path(key_path),
26 unique(unique), 28 unique(unique),
27 multi_entry(multi_entry) {} 29 multi_entry(multi_entry) {}
28 base::string16 name; 30 base::string16 name;
29 int64 id; 31 int64 id;
30 IndexedDBKeyPath key_path; 32 IndexedDBKeyPath key_path;
31 bool unique; 33 bool unique;
32 bool multi_entry; 34 bool multi_entry;
33
34 static const int64 kInvalidId = -1;
35 }; 35 };
36 36
37 struct CONTENT_EXPORT IndexedDBObjectStoreMetadata { 37 struct CONTENT_EXPORT IndexedDBObjectStoreMetadata {
38 typedef std::map<int64, IndexedDBIndexMetadata> IndexMap;
39
40 static const int64 kInvalidId = -1;
41
38 IndexedDBObjectStoreMetadata(); 42 IndexedDBObjectStoreMetadata();
39 IndexedDBObjectStoreMetadata(const base::string16& name, 43 IndexedDBObjectStoreMetadata(const base::string16& name,
40 int64 id, 44 int64 id,
41 const IndexedDBKeyPath& key_path, 45 const IndexedDBKeyPath& key_path,
42 bool auto_increment, 46 bool auto_increment,
43 int64 max_index_id); 47 int64 max_index_id);
44 ~IndexedDBObjectStoreMetadata(); 48 ~IndexedDBObjectStoreMetadata();
45 base::string16 name; 49 base::string16 name;
46 int64 id; 50 int64 id;
47 IndexedDBKeyPath key_path; 51 IndexedDBKeyPath key_path;
48 bool auto_increment; 52 bool auto_increment;
49 int64 max_index_id; 53 int64 max_index_id;
50 54
51 static const int64 kInvalidId = -1;
52
53 typedef std::map<int64, IndexedDBIndexMetadata> IndexMap;
54 IndexMap indexes; 55 IndexMap indexes;
55 }; 56 };
56 57
57 struct CONTENT_EXPORT IndexedDBDatabaseMetadata { 58 struct CONTENT_EXPORT IndexedDBDatabaseMetadata {
58 // TODO(jsbell): These can probably be collapsed into 0. 59 // TODO(jsbell): These can probably be collapsed into 0.
59 enum { 60 enum {
60 NO_INT_VERSION = -1, 61 NO_INT_VERSION = -1,
61 DEFAULT_INT_VERSION = 0 62 DEFAULT_INT_VERSION = 0
62 }; 63 };
63 64
(...skipping 11 matching lines...) Expand all
75 int64 id; 76 int64 id;
76 base::string16 version; 77 base::string16 version;
77 int64 int_version; 78 int64 int_version;
78 int64 max_object_store_id; 79 int64 max_object_store_id;
79 80
80 ObjectStoreMap object_stores; 81 ObjectStoreMap object_stores;
81 }; 82 };
82 } // namespace content 83 } // namespace content
83 84
84 #endif // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_METADATA_H_ 85 #endif // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_METADATA_H_
OLDNEW
« no previous file with comments | « content/browser/indexed_db/indexed_db_leveldb_coding.h ('k') | content/browser/indexed_db/indexed_db_transaction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698