diff options
| author | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-05 00:05:08 +0000 |
|---|---|---|
| committer | tony@chromium.org <tony@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-05 00:05:08 +0000 |
| commit | 0e30ef7b4eed575d9f4efd42ca23c18c7ca8bd6a (patch) | |
| tree | 8c088e1f17834ca98961f006868886c32bd46062 /chrome/browser/views/frame | |
| parent | 66de4f091a069b7d34a1afc16d6f1429a2b65781 (diff) | |
| download | chromium_src-0e30ef7b4eed575d9f4efd42ca23c18c7ca8bd6a.zip chromium_src-0e30ef7b4eed575d9f4efd42ca23c18c7ca8bd6a.tar.gz chromium_src-0e30ef7b4eed575d9f4efd42ca23c18c7ca8bd6a.tar.bz2 | |
Move the "history is too new" dialog out of
chrome/browser/history/history.cc. Instead use a notification
that Browser picks up and delegates to BrowserWindow.
Include implementations for Windows, Linux GTK+, and Linux Views
(sorry, no mac impl).
Review URL: http://codereview.chromium.org/200023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25556 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/frame')
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 21 | ||||
| -rw-r--r-- | chrome/browser/views/frame/browser_view.h | 1 |
2 files changed, 22 insertions, 0 deletions
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 490109c..08487fc 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -66,6 +66,7 @@ #include "views/window/window.h" #if defined(OS_WIN) +#include "app/win_util.h" #include "chrome/browser/jumplist.h" #include "views/controls/scrollbar/native_scroll_bar.h" #elif defined(OS_LINUX) @@ -1203,6 +1204,26 @@ void BrowserView::ShowRepostFormWarningDialog(TabContents* tab_contents) { browser::ShowRepostFormWarningDialog(GetNativeHandle(), tab_contents); } +void BrowserView::ShowHistoryTooNewDialog() { +#if defined(OS_WIN) + std::wstring title = l10n_util::GetString(IDS_PRODUCT_NAME); + std::wstring message = l10n_util::GetString(IDS_PROFILE_TOO_NEW_ERROR); + win_util::MessageBox(GetNativeHandle(), message, title, + MB_OK | MB_ICONWARNING | MB_TOPMOST); +#elif defined(OS_LINUX) + std::string title = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME); + std::string message = l10n_util::GetStringUTF8(IDS_PROFILE_TOO_NEW_ERROR); + GtkWidget* dialog = gtk_message_dialog_new(GetNativeHandle(), + static_cast<GtkDialogFlags>(0), GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, + "%s", message.c_str()); + gtk_window_set_title(GTK_WINDOW(dialog), title.c_str()); + gtk_dialog_run(GTK_DIALOG(dialog)); + gtk_widget_destroy(dialog); +#else + NOTIMPLEMENTED(); +#endif +} + void BrowserView::ConfirmBrowserCloseWithPendingDownloads() { DownloadInProgressConfirmDialogDelegate* delegate = new DownloadInProgressConfirmDialogDelegate(browser_.get()); diff --git a/chrome/browser/views/frame/browser_view.h b/chrome/browser/views/frame/browser_view.h index 0b97b33..2d06f98 100644 --- a/chrome/browser/views/frame/browser_view.h +++ b/chrome/browser/views/frame/browser_view.h @@ -246,6 +246,7 @@ class BrowserView : public BrowserWindow, virtual void ShowSelectProfileDialog(); virtual void ShowNewProfileDialog(); virtual void ShowRepostFormWarningDialog(TabContents* tab_contents); + virtual void ShowHistoryTooNewDialog(); virtual void ConfirmBrowserCloseWithPendingDownloads(); virtual void ShowHTMLDialog(HtmlDialogUIDelegate* delegate, gfx::NativeWindow parent_window); |