| Index: chrome/browser/web_data_service_factory.cc
|
| diff --git a/chrome/browser/web_data_service_factory.cc b/chrome/browser/web_data_service_factory.cc
|
| index 8cac57d74bae0c8611ca2db0d8906cf3e0d712a5..827aee89066260c951e847cd3f8172e89acc38b4 100644
|
| --- a/chrome/browser/web_data_service_factory.cc
|
| +++ b/chrome/browser/web_data_service_factory.cc
|
| @@ -55,11 +55,13 @@ ProfileErrorType ProfileErrorFromWebDataServiceWrapperError(
|
|
|
| // Callback to show error dialog on profile load error.
|
| void ProfileErrorCallback(WebDataServiceWrapper::ErrorType error_type,
|
| - sql::InitStatus status) {
|
| - ShowProfileErrorDialog(
|
| - ProfileErrorFromWebDataServiceWrapperError(error_type),
|
| - (status == sql::INIT_FAILURE) ?
|
| - IDS_COULDNT_OPEN_PROFILE_ERROR : IDS_PROFILE_TOO_NEW_ERROR);
|
| + sql::InitStatus status,
|
| + const std::string& diagnostics) {
|
| + ShowProfileErrorDialog(ProfileErrorFromWebDataServiceWrapperError(error_type),
|
| + (status == sql::INIT_FAILURE)
|
| + ? IDS_COULDNT_OPEN_PROFILE_ERROR
|
| + : IDS_PROFILE_TOO_NEW_ERROR,
|
| + diagnostics);
|
| }
|
|
|
| } // namespace
|
|
|