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

Side by Side Diff: app/sql/connection.cc

Issue 830002: win: string_util.h -> utf_string_conversions.h fix. (Closed)
Patch Set: Don't remove utf_string_conversions.h from string_util.h just yet Created 10 years, 9 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
« no previous file with comments | « app/os_exchange_data_win_unittest.cc ('k') | base/string_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 "app/sql/connection.h" 5 #include "app/sql/connection.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include "app/sql/statement.h" 9 #include "app/sql/statement.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/string_util.h" 12 #include "base/string_util.h"
13 #include "base/utf_string_conversions.h"
13 #include "third_party/sqlite/preprocessed/sqlite3.h" 14 #include "third_party/sqlite/preprocessed/sqlite3.h"
14 15
15 namespace sql { 16 namespace sql {
16 17
17 bool StatementID::operator<(const StatementID& other) const { 18 bool StatementID::operator<(const StatementID& other) const {
18 if (number_ != other.number_) 19 if (number_ != other.number_)
19 return number_ < other.number_; 20 return number_ < other.number_;
20 return strcmp(str_, other.str_) < 0; 21 return strcmp(str_, other.str_) < 0;
21 } 22 }
22 23
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 327
327 int Connection::OnSqliteError(int err, sql::Statement *stmt) { 328 int Connection::OnSqliteError(int err, sql::Statement *stmt) {
328 if (error_delegate_.get()) 329 if (error_delegate_.get())
329 return error_delegate_->OnError(err, this, stmt); 330 return error_delegate_->OnError(err, this, stmt);
330 // The default handling is to assert on debug and to ignore on release. 331 // The default handling is to assert on debug and to ignore on release.
331 NOTREACHED() << GetErrorMessage(); 332 NOTREACHED() << GetErrorMessage();
332 return err; 333 return err;
333 } 334 }
334 335
335 } // namespace sql 336 } // namespace sql
OLDNEW
« no previous file with comments | « app/os_exchange_data_win_unittest.cc ('k') | base/string_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698