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

Unified Diff: chrome/browser/history/chrome_history_client.cc

Issue 2225333003: Recreate the WebData database on a catastrophic SQL error (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix typo Created 4 years, 4 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/profiles/sql_init_error_message_ids.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/history/chrome_history_client.cc
diff --git a/chrome/browser/history/chrome_history_client.cc b/chrome/browser/history/chrome_history_client.cc
index 378853dfb3d289c6f13489385efcfdcc48dbecf3..082ed1b3bc9796a87eeccbc37b41048c03923650 100644
--- a/chrome/browser/history/chrome_history_client.cc
+++ b/chrome/browser/history/chrome_history_client.cc
@@ -10,9 +10,8 @@
#include "base/memory/ptr_util.h"
#include "chrome/browser/history/chrome_history_backend_client.h"
#include "chrome/browser/history/history_utils.h"
+#include "chrome/browser/profiles/sql_init_error_message_ids.h"
#include "chrome/browser/ui/profile_error_dialog.h"
-#include "chrome/grit/chromium_strings.h"
-#include "chrome/grit/generated_resources.h"
#include "components/bookmarks/browser/bookmark_model.h"
#include "components/history/core/browser/history_service.h"
@@ -66,10 +65,7 @@ bool ChromeHistoryClient::CanAddURL(const GURL& url) {
void ChromeHistoryClient::NotifyProfileError(sql::InitStatus init_status,
const std::string& diagnostics) {
ShowProfileErrorDialog(PROFILE_ERROR_HISTORY,
- (init_status == sql::INIT_FAILURE)
- ? IDS_COULDNT_OPEN_PROFILE_ERROR
- : IDS_PROFILE_TOO_NEW_ERROR,
- diagnostics);
+ SqlInitStatusToMessageId(init_status), diagnostics);
}
std::unique_ptr<history::HistoryBackendClient>
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/profiles/sql_init_error_message_ids.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698