summaryrefslogtreecommitdiffstats
path: root/chrome/browser/views/hung_renderer_view.cc
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 22:17:33 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 22:17:33 +0000
commit806aeb954d302328cc75bda71331474d8634675b (patch)
tree9565300c48ab1ea34b66624222ef979734f68b00 /chrome/browser/views/hung_renderer_view.cc
parent8f0a23470f47090c601078952b77c5b520c595c2 (diff)
downloadchromium_src-806aeb954d302328cc75bda71331474d8634675b.zip
chromium_src-806aeb954d302328cc75bda71331474d8634675b.tar.gz
chromium_src-806aeb954d302328cc75bda71331474d8634675b.tar.bz2
Refactor DialogDelegate so the DialogButton enum is in cross platform
code. This is mostly a find & replace in our code to use the new location of the enum. I also deleted some GetDialogButtons methods in child classes because they were identical to the parent version in DialogDelegate. This will allow more code to be enabled on linux/mac in the automation provider. Review URL: http://codereview.chromium.org/88008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14146 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/hung_renderer_view.cc')
-rw-r--r--chrome/browser/views/hung_renderer_view.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index 9d239e4..330c883 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -126,7 +126,7 @@ class HungRendererWarningView : public views::View,
virtual void WindowClosing();
virtual int GetDialogButtons() const;
virtual std::wstring GetDialogButtonLabel(
- views::DialogDelegate::DialogButton button) const;
+ MessageBox::DialogButton button) const;
virtual views::View* GetExtraView();
virtual bool Accept(bool window_closing);
virtual views::View* GetContentsView();
@@ -272,12 +272,12 @@ int HungRendererWarningView::GetDialogButtons() const {
// the OK button to wait for responsiveness (and close the dialog) and our
// additional button (which we create) to kill the process (which will result
// in the dialog being destroyed).
- return DIALOGBUTTON_OK;
+ return MessageBox::DIALOGBUTTON_OK;
}
std::wstring HungRendererWarningView::GetDialogButtonLabel(
- views::DialogDelegate::DialogButton button) const {
- if (button == DIALOGBUTTON_OK)
+ MessageBox::DialogButton button) const {
+ if (button == MessageBox::DIALOGBUTTON_OK)
return l10n_util::GetString(IDS_BROWSER_HANGMONITOR_RENDERER_WAIT);
return std::wstring();
}