ui: remove DialogDelegate::GetDialogButtons overrides

These are all straightforward.

Bug: 1011446
Change-Id: I6dacfff7d45b9f344be7c5533e1d810cb8332b69
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2007888
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Peter Boström <pbos@chromium.org>
Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#736892}

ui/chromeos/ime/candidate_window_view.cc

@@ -151,6 +151,7 @@ CandidateWindowView::CandidateWindowView(gfx::NativeView parent,
       should_show_upper_side_(false),
       was_candidate_window_open_(false),
       window_shell_id_(window_shell_id) {
+  DialogDelegate::set_buttons(ui::DIALOG_BUTTON_NONE);
   SetCanActivate(false);
   DCHECK(parent);
   set_parent_window(parent);
@@ -401,10 +402,6 @@ const char* CandidateWindowView::GetClassName() const {
   return "CandidateWindowView";
 }
 
-int CandidateWindowView::GetDialogButtons() const {
-  return ui::DIALOG_BUTTON_NONE;
-}
-
 void CandidateWindowView::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   for (size_t i = 0; i < candidate_views_.size(); ++i) {

ui/chromeos/ime/candidate_window_view.h

@@ -82,7 +82,6 @@ class UI_CHROMEOS_EXPORT CandidateWindowView
 
   // views::BubbleDialogDelegateView:
   const char* GetClassName() const override;
-  int GetDialogButtons() const override;
 
   // Overridden from views::ButtonListener:
   void ButtonPressed(views::Button* sender, const ui::Event& event) override;

ui/chromeos/ime/infolist_window.cc

@@ -173,6 +173,7 @@ InfolistWindow::InfolistWindow(views::View* candidate_window,
       title_font_list_(gfx::Font(kJapaneseFontName, kFontSizeDelta + 15)),
       description_font_list_(
           gfx::Font(kJapaneseFontName, kFontSizeDelta + 11)) {
+  DialogDelegate::set_buttons(ui::DIALOG_BUTTON_NONE);
   SetCanActivate(false);
   set_accept_events(false);
   set_margins(gfx::Insets());
@@ -275,10 +276,6 @@ const char* InfolistWindow::GetClassName() const {
   return "InfolistWindow";
 }
 
-int InfolistWindow::GetDialogButtons() const {
-  return ui::DIALOG_BUTTON_NONE;
-}
-
 void InfolistWindow::WindowClosing() {
   show_hide_timer_.Stop();
 }

ui/chromeos/ime/infolist_window.h

@@ -45,7 +45,6 @@ class UI_CHROMEOS_EXPORT InfolistWindow
  private:
   // views::BubbleDialogDelegateView:
   const char* GetClassName() const override;
-  int GetDialogButtons() const override;
 
   // views::WidgetDelegate implementation.
   void WindowClosing() override;

ui/views/examples/bubble_example.cc

@@ -54,11 +54,11 @@ base::string16 GetArrowName(BubbleBorder::Arrow arrow) {
 class ExampleBubble : public BubbleDialogDelegateView {
  public:
   ExampleBubble(View* anchor, BubbleBorder::Arrow arrow)
-      : BubbleDialogDelegateView(anchor, arrow) {}
+      : BubbleDialogDelegateView(anchor, arrow) {
+    DialogDelegate::set_buttons(ui::DIALOG_BUTTON_NONE);
+  }
 
  protected:
-  int GetDialogButtons() const override { return ui::DIALOG_BUTTON_NONE; }
-
   void Init() override {
     SetLayoutManager(std::make_unique<BoxLayout>(
         BoxLayout::Orientation::kVertical, gfx::Insets(50)));

ui/views/focus/focus_manager_unittest.cc

@@ -876,7 +876,9 @@ class AdvanceFocusWidgetDelegate : public WidgetDelegate {
 class TestBubbleDialogDelegateView : public BubbleDialogDelegateView {
  public:
   explicit TestBubbleDialogDelegateView(View* anchor)
-      : BubbleDialogDelegateView(anchor, BubbleBorder::NONE) {}
+      : BubbleDialogDelegateView(anchor, BubbleBorder::NONE) {
+    DialogDelegate::set_buttons(ui::DIALOG_BUTTON_NONE);
+  }
   ~TestBubbleDialogDelegateView() override = default;
 
   // If this is called, the bubble will be forced to use a NativeWidgetAura.
@@ -884,9 +886,6 @@ class TestBubbleDialogDelegateView : public BubbleDialogDelegateView {
   // platform and other factors.
   void UseNativeWidgetAura() { use_native_widget_aura_ = true; }
 
-  // BubbleDialogDelegateView:
-  int GetDialogButtons() const override { return 0; }
-
   void OnBeforeBubbleWidgetInit(Widget::InitParams* params,
                                 Widget* widget) const override {
 #if defined(USE_AURA)

ui/views/touchui/touch_selection_menu_views.cc

@@ -41,6 +41,7 @@ TouchSelectionMenuViews::TouchSelectionMenuViews(
   DCHECK(owner_);
   DCHECK(client_);
 
+  DialogDelegate::set_buttons(ui::DIALOG_BUTTON_NONE);
   set_shadow(BubbleBorder::SMALL_SHADOW);
   set_parent_window(context);
   constexpr gfx::Insets kMenuMargins = gfx::Insets(1);
@@ -167,10 +168,6 @@ void TouchSelectionMenuViews::WindowClosing() {
     DisconnectOwner();
 }
 
-int TouchSelectionMenuViews::GetDialogButtons() const {
-  return ui::DIALOG_BUTTON_NONE;
-}
-
 void TouchSelectionMenuViews::ButtonPressed(Button* sender,
                                             const ui::Event& event) {
   CloseMenu();

ui/views/touchui/touch_selection_menu_views.h

@@ -59,7 +59,6 @@ class VIEWS_EXPORT TouchSelectionMenuViews : public BubbleDialogDelegateView,
   // BubbleDialogDelegateView:
   void OnPaint(gfx::Canvas* canvas) override;
   void WindowClosing() override;
-  int GetDialogButtons() const override;
 
   TouchSelectionMenuRunnerViews* owner_;
   ui::TouchSelectionMenuClient* const client_;

ui/views/widget/native_widget_mac_unittest.mm

@@ -1109,17 +1109,18 @@ class ModalDialogDelegate : public DialogDelegateView {
       : modal_type_(modal_type) {}
 
   void set_can_close(bool value) { can_close_ = value; }
-  void set_buttons(int buttons) { buttons_ = buttons; }
+  void SetButtons(int buttons) {
+    DialogDelegate::set_buttons(buttons);
+    DialogModelChanged();
+  }
 
   // DialogDelegateView:
-  int GetDialogButtons() const override { return buttons_; }
   ui::ModalType GetModalType() const override { return modal_type_; }
   bool Close() override { return can_close_; }
 
  private:
   const ui::ModalType modal_type_;
   bool can_close_ = true;
-  int buttons_ = ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
 
   DISALLOW_COPY_AND_ASSIGN(ModalDialogDelegate);
 };
@@ -2440,7 +2441,7 @@ TEST_F(NativeWidgetMacTest, TouchBar) {
   }
 
   // Remove the cancel button.
-  delegate->set_buttons(ui::DIALOG_BUTTON_OK);
+  delegate->SetButtons(ui::DIALOG_BUTTON_OK);
   delegate->DialogModelChanged();
   EXPECT_TRUE(delegate->GetOkButton());
   EXPECT_FALSE(delegate->GetCancelButton());

ui/views/window/dialog_delegate_unittest.cc

@@ -69,7 +69,6 @@ class TestDialog : public DialogDelegateView {
   }
   base::string16 GetWindowTitle() const override { return title_; }
   View* GetInitiallyFocusedView() override { return input_; }
-  int GetDialogButtons() const override { return dialog_buttons_; }
 
   void CheckAndResetStates(bool canceled,
                            bool accepted,
@@ -94,9 +93,6 @@ class TestDialog : public DialogDelegateView {
   void set_should_handle_escape(bool should_handle_escape) {
     should_handle_escape_ = should_handle_escape;
   }
-  void set_dialog_buttons(int dialog_buttons) {
-    dialog_buttons_ = dialog_buttons;
-  }
 
   views::Textfield* input() { return input_; }
 
@@ -110,7 +106,6 @@ class TestDialog : public DialogDelegateView {
   base::string16 title_;
   bool show_close_button_ = true;
   bool should_handle_escape_ = false;
-  int dialog_buttons_ = ui::DIALOG_BUTTON_OK | ui::DIALOG_BUTTON_CANCEL;
 
   DISALLOW_COPY_AND_ASSIGN(TestDialog);
 };
@@ -369,12 +364,11 @@ TEST_F(DialogTest, InitialFocus) {
 // A dialog for testing initial focus with only an OK button.
 class InitialFocusTestDialog : public DialogDelegateView {
  public:
-  InitialFocusTestDialog() = default;
+  InitialFocusTestDialog() {
+    DialogDelegate::set_buttons(ui::DIALOG_BUTTON_OK);
+  }
   ~InitialFocusTestDialog() override = default;
 
-  // DialogDelegateView overrides:
-  int GetDialogButtons() const override { return ui::DIALOG_BUTTON_OK; }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(InitialFocusTestDialog);
 };