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

Unified Diff: sql/connection.cc

Issue 16788002: Remove sql::ErrorDelegate. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase conflict Created 7 years, 6 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 | « sql/connection.h ('k') | sql/sqlite_features_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sql/connection.cc
diff --git a/sql/connection.cc b/sql/connection.cc
index dd71563292a9c4689db517163e38d5731370f95b..510d6a771b4b7598e4f83f6cba68ded7520b3cb0 100644
--- a/sql/connection.cc
+++ b/sql/connection.cc
@@ -74,9 +74,6 @@ bool StatementID::operator<(const StatementID& other) const {
return strcmp(str_, other.str_) < 0;
}
-ErrorDelegate::~ErrorDelegate() {
-}
-
Connection::StatementRef::StatementRef(Connection* connection,
sqlite3_stmt* stmt,
bool was_valid)
@@ -122,7 +119,8 @@ Connection::Connection()
transaction_nesting_(0),
needs_rollback_(false),
in_memory_(false),
- poisoned_(false) {}
+ poisoned_(false) {
+}
Connection::~Connection() {
Close();
@@ -762,11 +760,6 @@ int Connection::OnSqliteError(int err, sql::Statement *stmt) {
return err;
}
- // TODO(shess): Remove |error_delegate_| once everything is
- // converted to |error_callback_|.
- if (error_delegate_.get())
- return error_delegate_->OnError(err, this, stmt);
-
// The default handling is to assert on debug and to ignore on release.
DLOG(FATAL) << GetErrorMessage();
return err;
« no previous file with comments | « sql/connection.h ('k') | sql/sqlite_features_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698