Commit 69b5457e authored by siyua's avatar siyua Committed by Commit Bot

Change LocalCardMigrationDialogView to BubbleDialogDelegateView

Bug: 897998
Change-Id: I040aa20d9c388c8490db51e120227a3bdecb6aab
Reviewed-on: https://chromium-review.googlesource.com/c/1318535Reviewed-by: default avatarBret Sepulveda <bsep@chromium.org>
Commit-Queue: Siyu An <siyua@chromium.org>
Cr-Commit-Position: refs/heads/master@{#606290}
parent 77ef5807
......@@ -293,7 +293,10 @@ class LocalCardMigrationOfferView : public views::View,
LocalCardMigrationDialogView::LocalCardMigrationDialogView(
LocalCardMigrationDialogController* controller,
content::WebContents* web_contents)
: controller_(controller), web_contents_(web_contents) {}
: controller_(controller), web_contents_(web_contents) {
set_close_on_deactivate(false);
set_margins(gfx::Insets());
}
LocalCardMigrationDialogView::~LocalCardMigrationDialogView() {}
......@@ -319,10 +322,6 @@ ui::ModalType LocalCardMigrationDialogView::GetModalType() const {
return ui::MODAL_TYPE_CHILD;
}
void LocalCardMigrationDialogView::AddedToWidget() {
GetWidget()->AddObserver(this);
}
bool LocalCardMigrationDialogView::ShouldShowCloseButton() const {
return false;
}
......@@ -370,9 +369,8 @@ bool LocalCardMigrationDialogView::Cancel() {
}
}
void LocalCardMigrationDialogView::OnWidgetClosing(views::Widget* widget) {
void LocalCardMigrationDialogView::WindowClosing() {
controller_->OnDialogClosed();
widget->RemoveObserver(this);
}
// TODO(crbug/867194): Add button pressed logic for kDeleteCardButtonTag.
......
......@@ -9,9 +9,9 @@
#include "chrome/browser/ui/autofill/local_card_migration_dialog.h"
#include "chrome/browser/ui/views/autofill/dialog_view_ids.h"
#include "components/autofill/core/browser/ui/local_card_migration_dialog_controller.h"
#include "ui/views/bubble/bubble_dialog_delegate_view.h"
#include "ui/views/controls/button/button.h"
#include "ui/views/view.h"
#include "ui/views/widget/widget_observer.h"
#include "ui/views/window/dialog_delegate.h"
namespace content {
......@@ -24,9 +24,8 @@ enum class LocalCardMigrationDialogState;
class LocalCardMigrationOfferView;
class LocalCardMigrationDialogView : public LocalCardMigrationDialog,
public views::ButtonListener,
public views::DialogDelegateView,
public views::WidgetObserver {
public views::BubbleDialogDelegateView,
public views::ButtonListener {
public:
LocalCardMigrationDialogView(LocalCardMigrationDialogController* controller,
content::WebContents* web_contents);
......@@ -36,24 +35,21 @@ class LocalCardMigrationDialogView : public LocalCardMigrationDialog,
void ShowDialog() override;
void CloseDialog() override;
// views::DialogDelegateView
// views::BubbleDialogDelegateView
gfx::Size CalculatePreferredSize() const override;
ui::ModalType GetModalType() const override;
void AddedToWidget() override;
bool ShouldShowCloseButton() const override;
base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
bool IsDialogButtonEnabled(ui::DialogButton button) const override;
bool Accept() override;
bool Cancel() override;
// views::WidgetObserver
void OnWidgetClosing(views::Widget* widget) override;
void Init() override;
void WindowClosing() override;
// views::ButtonListener
void ButtonPressed(views::Button* sender, const ui::Event& event) override;
private:
void Init();
base::string16 GetOkButtonLabel() const;
base::string16 GetCancelButtonLabel() const;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment