diff options
author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 22:34:41 +0000 |
---|---|---|
committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-30 22:34:41 +0000 |
commit | e587a45fcdc7dec3c5ce894e4fac236cdb8fe2ad (patch) | |
tree | 04883155bf0e43a7dba6717d5f3ce4526c34712e /chrome/browser/browser.cc | |
parent | 61206e0c3dfcf17e748dec65139d7e8e3449c8a3 (diff) | |
download | chromium_src-e587a45fcdc7dec3c5ce894e4fac236cdb8fe2ad.zip chromium_src-e587a45fcdc7dec3c5ce894e4fac236cdb8fe2ad.tar.gz chromium_src-e587a45fcdc7dec3c5ce894e4fac236cdb8fe2ad.tar.bz2 |
Show a warning when the history files can't be read correctly.
This re-plumbs the existing "TooNew" codepath to handle arbitrary error messages.
BUG=25822
TEST=Make your history files non-readable, run Chrome (Release), make sure you get a warning dialog.
Review URL: http://codereview.chromium.org/342048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@30642 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser.cc')
-rw-r--r-- | chrome/browser/browser.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc index 71ef534..295beff 100644 --- a/chrome/browser/browser.cc +++ b/chrome/browser/browser.cc @@ -140,7 +140,7 @@ Browser::Browser(Type type, Profile* profile) NotificationService::AllSources()); registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED, NotificationService::AllSources()); - registrar_.Add(this, NotificationType::HISTORY_TOO_NEW, + registrar_.Add(this, NotificationType::PROFILE_ERROR, NotificationService::AllSources()); // Need to know when to alert the user of theme install delay. @@ -2264,10 +2264,11 @@ void Browser::Observe(NotificationType type, break; } - case NotificationType::HISTORY_TOO_NEW: { + case NotificationType::PROFILE_ERROR: { if (BrowserList::GetLastActive() != this) break; - window()->ShowHistoryTooNewDialog(); + int* message_id = Details<int>(details).ptr(); + window()->ShowProfileErrorDialog(*message_id); break; } |