| Index: chrome/browser/ui/views/tab_modal_dialog_view.cc
|
| diff --git a/chrome/browser/ui/views/repost_form_warning_view.cc b/chrome/browser/ui/views/tab_modal_dialog_view.cc
|
| similarity index 53%
|
| rename from chrome/browser/ui/views/repost_form_warning_view.cc
|
| rename to chrome/browser/ui/views/tab_modal_dialog_view.cc
|
| index 36d92907a18b4e1d1a8004d65c37fbf7071118eb..f099ddf6d428a68619eec0fd803174abdb8a2122 100644
|
| --- a/chrome/browser/ui/views/repost_form_warning_view.cc
|
| +++ b/chrome/browser/ui/views/tab_modal_dialog_view.cc
|
| @@ -2,13 +2,13 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/ui/views/repost_form_warning_view.h"
|
| +#include "chrome/browser/ui/views/tab_modal_dialog_view.h"
|
|
|
| #include "base/utf_string_conversions.h"
|
| -#include "chrome/browser/repost_form_warning_controller.h"
|
| #include "chrome/browser/ui/browser_list.h"
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
|
| +#include "chrome/browser/ui/tab_modal_dialog_delegate.h"
|
| #include "chrome/browser/ui/views/constrained_window_views.h"
|
| #include "content/browser/tab_contents/navigation_controller.h"
|
| #include "content/browser/tab_contents/tab_contents.h"
|
| @@ -19,74 +19,76 @@
|
| namespace browser {
|
|
|
| // Declared in browser_dialogs.h so others don't have to depend on our header.
|
| -void ShowRepostFormWarningDialog(gfx::NativeWindow parent_window,
|
| - TabContents* tab_contents) {
|
| - new RepostFormWarningView(parent_window, tab_contents);
|
| +void ShowTabModalDialog(TabModalDialogDelegate* delegate,
|
| + gfx::NativeWindow parent_window,
|
| + TabContents* tab_contents) {
|
| + new TabModalDialogDelegateView(delegate, parent_window, tab_contents);
|
| }
|
|
|
| } // namespace browser
|
|
|
| //////////////////////////////////////////////////////////////////////////////
|
| -// RepostFormWarningView, constructor & destructor:
|
| +// TabModalDialogDelegateView, constructor & destructor:
|
|
|
| -RepostFormWarningView::RepostFormWarningView(
|
| +TabModalDialogDelegateView::TabModalDialogDelegateView(
|
| + TabModalDialogDelegate* delegate,
|
| gfx::NativeWindow parent_window,
|
| TabContents* tab_contents)
|
| - : controller_(new RepostFormWarningController(tab_contents)),
|
| + : delegate_(delegate),
|
| message_box_view_(NULL) {
|
| message_box_view_ = new views::MessageBoxView(
|
| views::MessageBoxView::NO_OPTIONS,
|
| - l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING),
|
| + delegate->GetMessage(),
|
| string16());
|
| TabContentsWrapper* wrapper =
|
| TabContentsWrapper::GetCurrentWrapperForContents(tab_contents);
|
| - controller_->set_window(new ConstrainedWindowViews(wrapper, this));
|
| + delegate_->set_window(new ConstrainedWindowViews(wrapper, this));
|
| }
|
|
|
| -RepostFormWarningView::~RepostFormWarningView() {
|
| +TabModalDialogDelegateView::~TabModalDialogDelegateView() {
|
| }
|
|
|
| //////////////////////////////////////////////////////////////////////////////
|
| -// RepostFormWarningView, views::DialogDelegate implementation:
|
| +// TabModalDialogDelegateView, views::DialogDelegate implementation:
|
|
|
| -string16 RepostFormWarningView::GetWindowTitle() const {
|
| - return l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING_TITLE);
|
| +string16 TabModalDialogDelegateView::GetWindowTitle() const {
|
| + return delegate_->GetTitle();
|
| }
|
|
|
| -string16 RepostFormWarningView::GetDialogButtonLabel(
|
| +string16 TabModalDialogDelegateView::GetDialogButtonLabel(
|
| ui::DialogButton button) const {
|
| if (button == ui::DIALOG_BUTTON_OK)
|
| - return l10n_util::GetStringUTF16(IDS_HTTP_POST_WARNING_RESEND);
|
| + return delegate_->GetAcceptButtonTitle();
|
| if (button == ui::DIALOG_BUTTON_CANCEL)
|
| - return l10n_util::GetStringUTF16(IDS_CANCEL);
|
| + return delegate_->GetCancelButtonTitle();
|
| return string16();
|
| }
|
|
|
| -views::View* RepostFormWarningView::GetContentsView() {
|
| - return message_box_view_;
|
| +bool TabModalDialogDelegateView::Cancel() {
|
| + delegate_->Cancel();
|
| + return true;
|
| }
|
|
|
| -views::Widget* RepostFormWarningView::GetWidget() {
|
| - return message_box_view_->GetWidget();
|
| +bool TabModalDialogDelegateView::Accept() {
|
| + delegate_->Accept();
|
| + return true;
|
| }
|
|
|
| -const views::Widget* RepostFormWarningView::GetWidget() const {
|
| - return message_box_view_->GetWidget();
|
| -}
|
| +///////////////////////////////////////////////////////////////////////////////
|
| +// TabModalDialogDelegateView, views::WidgetDelegate implementation:
|
|
|
| -bool RepostFormWarningView::Cancel() {
|
| - controller_->Cancel();
|
| - return true;
|
| +views::View* TabModalDialogDelegateView::GetContentsView() {
|
| + return message_box_view_;
|
| }
|
|
|
| -bool RepostFormWarningView::Accept() {
|
| - controller_->Continue();
|
| - return true;
|
| +views::Widget* TabModalDialogDelegateView::GetWidget() {
|
| + return message_box_view_->GetWidget();
|
| }
|
|
|
| -///////////////////////////////////////////////////////////////////////////////
|
| -// RepostFormWarningView, RepostFormWarning implementation:
|
| +const views::Widget* TabModalDialogDelegateView::GetWidget() const {
|
| + return message_box_view_->GetWidget();
|
| +}
|
|
|
| -void RepostFormWarningView::DeleteDelegate() {
|
| +void TabModalDialogDelegateView::DeleteDelegate() {
|
| delete this;
|
| }
|
|
|