| Index: components/webdata/common/web_database_backend.h
|
| diff --git a/components/webdata/common/web_database_backend.h b/components/webdata/common/web_database_backend.h
|
| index 341bb76d7ac5a095943fcd281970fc7316083309..f89e3232eae731851de8030534530d3f9f057da0 100644
|
| --- a/components/webdata/common/web_database_backend.h
|
| +++ b/components/webdata/common/web_database_backend.h
|
| @@ -39,7 +39,11 @@ class WEBDATA_EXPORT WebDatabaseBackend
|
| virtual ~Delegate() {}
|
|
|
| // Invoked when the backend has finished loading the db.
|
| - virtual void DBLoaded(sql::InitStatus status) = 0;
|
| + // |status| is the result of initializing the db.
|
| + // |diagnostics| contains diagnostic information about the db, and it will
|
| + // only be populated when an error occurs.
|
| + virtual void DBLoaded(sql::InitStatus status,
|
| + const std::string& diagnostics) = 0;
|
| };
|
|
|
| WebDatabaseBackend(
|
| @@ -90,6 +94,9 @@ class WEBDATA_EXPORT WebDatabaseBackend
|
| virtual ~WebDatabaseBackend();
|
|
|
| private:
|
| + // Invoked on a db error.
|
| + void DatabaseErrorCallback(int error, sql::Statement* stmt);
|
| +
|
| // Commit the current transaction.
|
| void Commit();
|
|
|
| @@ -115,6 +122,10 @@ class WEBDATA_EXPORT WebDatabaseBackend
|
| // before the db is ready.
|
| sql::InitStatus init_status_;
|
|
|
| + // Contains diagnostic information about the database that will be filled when
|
| + // a catastrophic error occurs.
|
| + std::string db_diagnostics_;
|
| +
|
| // True if an attempt has been made to load the database (even if the attempt
|
| // fails), used to avoid continually trying to reinit if the db init fails.
|
| bool init_complete_;
|
|
|