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

Side by Side Diff: content/browser/indexed_db/indexed_db_index_writer.cc

Issue 102593002: Convert string16 to base::string16 in content. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years 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 #include "content/browser/indexed_db/indexed_db_index_writer.h" 5 #include "content/browser/indexed_db/indexed_db_index_writer.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "content/browser/indexed_db/indexed_db_backing_store.h" 9 #include "content/browser/indexed_db/indexed_db_backing_store.h"
10 #include "content/browser/indexed_db/indexed_db_tracing.h" 10 #include "content/browser/indexed_db/indexed_db_tracing.h"
(...skipping 16 matching lines...) Expand all
27 IndexWriter::~IndexWriter() {} 27 IndexWriter::~IndexWriter() {}
28 28
29 bool IndexWriter::VerifyIndexKeys( 29 bool IndexWriter::VerifyIndexKeys(
30 IndexedDBBackingStore* backing_store, 30 IndexedDBBackingStore* backing_store,
31 IndexedDBBackingStore::Transaction* transaction, 31 IndexedDBBackingStore::Transaction* transaction,
32 int64 database_id, 32 int64 database_id,
33 int64 object_store_id, 33 int64 object_store_id,
34 int64 index_id, 34 int64 index_id,
35 bool* can_add_keys, 35 bool* can_add_keys,
36 const IndexedDBKey& primary_key, 36 const IndexedDBKey& primary_key,
37 string16* error_message) const { 37 base::string16* error_message) const {
38 *can_add_keys = false; 38 *can_add_keys = false;
39 for (size_t i = 0; i < index_keys_.size(); ++i) { 39 for (size_t i = 0; i < index_keys_.size(); ++i) {
40 bool ok = AddingKeyAllowed(backing_store, 40 bool ok = AddingKeyAllowed(backing_store,
41 transaction, 41 transaction,
42 database_id, 42 database_id,
43 object_store_id, 43 object_store_id,
44 index_id, 44 index_id,
45 (index_keys_)[i], 45 (index_keys_)[i],
46 primary_key, 46 primary_key,
47 can_add_keys); 47 can_add_keys);
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 bool MakeIndexWriters( 115 bool MakeIndexWriters(
116 scoped_refptr<IndexedDBTransaction> transaction, 116 scoped_refptr<IndexedDBTransaction> transaction,
117 IndexedDBBackingStore* backing_store, 117 IndexedDBBackingStore* backing_store,
118 int64 database_id, 118 int64 database_id,
119 const IndexedDBObjectStoreMetadata& object_store, 119 const IndexedDBObjectStoreMetadata& object_store,
120 const IndexedDBKey& primary_key, // makes a copy 120 const IndexedDBKey& primary_key, // makes a copy
121 bool key_was_generated, 121 bool key_was_generated,
122 const std::vector<int64>& index_ids, 122 const std::vector<int64>& index_ids,
123 const std::vector<IndexedDBDatabase::IndexKeys>& index_keys, 123 const std::vector<IndexedDBDatabase::IndexKeys>& index_keys,
124 ScopedVector<IndexWriter>* index_writers, 124 ScopedVector<IndexWriter>* index_writers,
125 string16* error_message, 125 base::string16* error_message,
126 bool* completed) { 126 bool* completed) {
127 DCHECK_EQ(index_ids.size(), index_keys.size()); 127 DCHECK_EQ(index_ids.size(), index_keys.size());
128 *completed = false; 128 *completed = false;
129 129
130 std::map<int64, IndexedDBDatabase::IndexKeys> index_key_map; 130 std::map<int64, IndexedDBDatabase::IndexKeys> index_key_map;
131 for (size_t i = 0; i < index_ids.size(); ++i) 131 for (size_t i = 0; i < index_ids.size(); ++i)
132 index_key_map[index_ids[i]] = index_keys[i]; 132 index_key_map[index_ids[i]] = index_keys[i];
133 133
134 for (IndexedDBObjectStoreMetadata::IndexMap::const_iterator it = 134 for (IndexedDBObjectStoreMetadata::IndexMap::const_iterator it =
135 object_store.indexes.begin(); 135 object_store.indexes.begin();
(...skipping 24 matching lines...) Expand all
160 return true; 160 return true;
161 161
162 index_writers->push_back(index_writer.release()); 162 index_writers->push_back(index_writer.release());
163 } 163 }
164 164
165 *completed = true; 165 *completed = true;
166 return true; 166 return true;
167 } 167 }
168 168
169 } // namespace content 169 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/indexed_db/indexed_db_index_writer.h ('k') | content/browser/indexed_db/indexed_db_leveldb_coding.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698