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/gtk | |
| 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/gtk')
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/gtk/browser_window_gtk.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/gtk/browser_window_gtk.cc b/chrome/browser/gtk/browser_window_gtk.cc index 1d084f2..a3108b7 100644 --- a/chrome/browser/gtk/browser_window_gtk.cc +++ b/chrome/browser/gtk/browser_window_gtk.cc @@ -1127,9 +1127,9 @@ void BrowserWindowGtk::ShowRepostFormWarningDialog( new RepostFormWarningGtk(GetNativeHandle(), &tab_contents->controller()); } -void BrowserWindowGtk::ShowHistoryTooNewDialog() { +void BrowserWindowGtk::ShowProfileErrorDialog(int message_id) { std::string title = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME); - std::string message = l10n_util::GetStringUTF8(IDS_PROFILE_TOO_NEW_ERROR); + std::string message = l10n_util::GetStringUTF8(message_id); GtkWidget* dialog = gtk_message_dialog_new(window_, static_cast<GtkDialogFlags>(0), GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, "%s", message.c_str()); diff --git a/chrome/browser/gtk/browser_window_gtk.h b/chrome/browser/gtk/browser_window_gtk.h index 4b01239..1f5f91c 100644 --- a/chrome/browser/gtk/browser_window_gtk.h +++ b/chrome/browser/gtk/browser_window_gtk.h @@ -104,7 +104,7 @@ class BrowserWindowGtk : public BrowserWindow, virtual void ShowSelectProfileDialog(); virtual void ShowNewProfileDialog(); virtual void ShowRepostFormWarningDialog(TabContents* tab_contents); - virtual void ShowHistoryTooNewDialog(); + virtual void ShowProfileErrorDialog(int message_id); virtual void ShowThemeInstallBubble(); virtual void ConfirmBrowserCloseWithPendingDownloads(); virtual void ShowHTMLDialog(HtmlDialogUIDelegate* delegate, |