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

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

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 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 #include "content/browser/indexed_db/indexed_db_database.h" 5 #include "content/browser/indexed_db/indexed_db_database.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 #include <set> 8 #include <set>
9 9
10 #include "base/auto_reset.h" 10 #include "base/auto_reset.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/memory/scoped_ptr.h" 12 #include "base/memory/scoped_ptr.h"
13 #include "base/stl_util.h" 13 #include "base/stl_util.h"
14 #include "base/strings/string_number_conversions.h" 14 #include "base/strings/string_number_conversions.h"
15 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
16 #include "content/browser/indexed_db/indexed_db_connection.h" 16 #include "content/browser/indexed_db/indexed_db_connection.h"
17 #include "content/browser/indexed_db/indexed_db_cursor.h" 17 #include "content/browser/indexed_db/indexed_db_cursor.h"
18 #include "content/browser/indexed_db/indexed_db_factory.h" 18 #include "content/browser/indexed_db/indexed_db_factory.h"
19 #include "content/browser/indexed_db/indexed_db_index_writer.h" 19 #include "content/browser/indexed_db/indexed_db_index_writer.h"
20 #include "content/browser/indexed_db/indexed_db_tracing.h" 20 #include "content/browser/indexed_db/indexed_db_tracing.h"
21 #include "content/browser/indexed_db/indexed_db_transaction.h" 21 #include "content/browser/indexed_db/indexed_db_transaction.h"
22 #include "content/common/indexed_db/indexed_db_key_path.h" 22 #include "content/common/indexed_db/indexed_db_key_path.h"
23 #include "content/common/indexed_db/indexed_db_key_range.h" 23 #include "content/common/indexed_db/indexed_db_key_range.h"
24 #include "content/public/browser/browser_thread.h" 24 #include "content/public/browser/browser_thread.h"
25 #include "third_party/WebKit/public/platform/WebIDBDatabaseException.h" 25 #include "third_party/WebKit/public/platform/WebIDBDatabaseException.h"
26 26
27 using base::ASCIIToUTF16;
27 using base::Int64ToString16; 28 using base::Int64ToString16;
28 using blink::WebIDBKeyTypeNumber; 29 using blink::WebIDBKeyTypeNumber;
29 30
30 namespace content { 31 namespace content {
31 32
32 // PendingOpenCall has a scoped_refptr<IndexedDBDatabaseCallbacks> because it 33 // PendingOpenCall has a scoped_refptr<IndexedDBDatabaseCallbacks> because it
33 // isn't a connection yet. 34 // isn't a connection yet.
34 class IndexedDBDatabase::PendingOpenCall { 35 class IndexedDBDatabase::PendingOpenCall {
35 public: 36 public:
36 PendingOpenCall(scoped_refptr<IndexedDBCallbacks> callbacks, 37 PendingOpenCall(scoped_refptr<IndexedDBCallbacks> callbacks,
(...skipping 1622 matching lines...) Expand 10 before | Expand all | Expand 10 after
1659 const base::string16& previous_version, 1660 const base::string16& previous_version,
1660 int64 previous_int_version, 1661 int64 previous_int_version,
1661 IndexedDBTransaction* transaction) { 1662 IndexedDBTransaction* transaction) {
1662 IDB_TRACE("IndexedDBDatabase::VersionChangeAbortOperation"); 1663 IDB_TRACE("IndexedDBDatabase::VersionChangeAbortOperation");
1663 DCHECK(!transaction); 1664 DCHECK(!transaction);
1664 metadata_.version = previous_version; 1665 metadata_.version = previous_version;
1665 metadata_.int_version = previous_int_version; 1666 metadata_.int_version = previous_int_version;
1666 } 1667 }
1667 1668
1668 } // namespace content 1669 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/indexed_db/indexed_db_browsertest.cc ('k') | content/browser/indexed_db/indexed_db_database_error.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698