| 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 61f4b21fee0bb77b8623a0c7826202365e813f92..13b511db6038c8fdce11c9bece750d27c6a02b14 100644
|
| --- a/chrome/browser/history/chrome_history_client.cc
|
| +++ b/chrome/browser/history/chrome_history_client.cc
|
| @@ -5,7 +5,10 @@
|
| #include "chrome/browser/history/chrome_history_client.h"
|
|
|
| #include "base/logging.h"
|
| +#include "chrome/browser/ui/profile_error_dialog.h"
|
| #include "components/bookmarks/browser/bookmark_model.h"
|
| +#include "grit/chromium_strings.h"
|
| +#include "grit/generated_resources.h"
|
|
|
| ChromeHistoryClient::ChromeHistoryClient(BookmarkModel* bookmark_model)
|
| : bookmark_model_(bookmark_model) {
|
| @@ -35,6 +38,13 @@ void ChromeHistoryClient::GetBookmarks(
|
| }
|
| }
|
|
|
| +void ChromeHistoryClient::NotifyProfileError(sql::InitStatus init_status) {
|
| + ShowProfileErrorDialog(
|
| + PROFILE_ERROR_HISTORY,
|
| + (init_status == sql::INIT_FAILURE) ?
|
| + IDS_COULDNT_OPEN_PROFILE_ERROR : IDS_PROFILE_TOO_NEW_ERROR);
|
| +}
|
| +
|
| void ChromeHistoryClient::Shutdown() {
|
| // It's possible that bookmarks haven't loaded and history is waiting for
|
| // bookmarks to complete loading. In such a situation history can't shutdown
|
|
|