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

Side by Side Diff: content/browser/indexed_db/indexed_db_callbacks.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_callbacks.h" 5 #include "content/browser/indexed_db/indexed_db_callbacks.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "content/browser/indexed_db/indexed_db_connection.h" 9 #include "content/browser/indexed_db/indexed_db_connection.h"
10 #include "content/browser/indexed_db/indexed_db_cursor.h" 10 #include "content/browser/indexed_db/indexed_db_cursor.h"
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 IndexedDBCallbacks::~IndexedDBCallbacks() {} 64 IndexedDBCallbacks::~IndexedDBCallbacks() {}
65 65
66 void IndexedDBCallbacks::OnError(const IndexedDBDatabaseError& error) { 66 void IndexedDBCallbacks::OnError(const IndexedDBDatabaseError& error) {
67 DCHECK(dispatcher_host_.get()); 67 DCHECK(dispatcher_host_.get());
68 68
69 dispatcher_host_->Send(new IndexedDBMsg_CallbacksError( 69 dispatcher_host_->Send(new IndexedDBMsg_CallbacksError(
70 ipc_thread_id_, ipc_callbacks_id_, error.code(), error.message())); 70 ipc_thread_id_, ipc_callbacks_id_, error.code(), error.message()));
71 dispatcher_host_ = NULL; 71 dispatcher_host_ = NULL;
72 } 72 }
73 73
74 void IndexedDBCallbacks::OnSuccess(const std::vector<string16>& value) { 74 void IndexedDBCallbacks::OnSuccess(const std::vector<base::string16>& value) {
75 DCHECK(dispatcher_host_.get()); 75 DCHECK(dispatcher_host_.get());
76 76
77 DCHECK_EQ(kNoCursor, ipc_cursor_id_); 77 DCHECK_EQ(kNoCursor, ipc_cursor_id_);
78 DCHECK_EQ(kNoTransaction, host_transaction_id_); 78 DCHECK_EQ(kNoTransaction, host_transaction_id_);
79 DCHECK_EQ(kNoDatabase, ipc_database_id_); 79 DCHECK_EQ(kNoDatabase, ipc_database_id_);
80 DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_); 80 DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_);
81 81
82 std::vector<string16> list; 82 std::vector<base::string16> list;
83 for (unsigned i = 0; i < value.size(); ++i) 83 for (unsigned i = 0; i < value.size(); ++i)
84 list.push_back(value[i]); 84 list.push_back(value[i]);
85 85
86 dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessStringList( 86 dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessStringList(
87 ipc_thread_id_, ipc_callbacks_id_, list)); 87 ipc_thread_id_, ipc_callbacks_id_, list));
88 dispatcher_host_ = NULL; 88 dispatcher_host_ = NULL;
89 } 89 }
90 90
91 void IndexedDBCallbacks::OnBlocked(int64 existing_version) { 91 void IndexedDBCallbacks::OnBlocked(int64 existing_version) {
92 DCHECK(dispatcher_host_.get()); 92 DCHECK(dispatcher_host_.get());
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
328 DCHECK_EQ(kNoTransaction, host_transaction_id_); 328 DCHECK_EQ(kNoTransaction, host_transaction_id_);
329 DCHECK_EQ(kNoDatabase, ipc_database_id_); 329 DCHECK_EQ(kNoDatabase, ipc_database_id_);
330 DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_); 330 DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_);
331 331
332 dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessUndefined( 332 dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessUndefined(
333 ipc_thread_id_, ipc_callbacks_id_)); 333 ipc_thread_id_, ipc_callbacks_id_));
334 dispatcher_host_ = NULL; 334 dispatcher_host_ = NULL;
335 } 335 }
336 336
337 } // namespace content 337 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/indexed_db/indexed_db_callbacks.h ('k') | content/browser/indexed_db/indexed_db_database.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698