Convert location bar bubble delegates to bubble dialog delegates

ui/views/window/dialog_delegate_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event_processor.h"
@@ skipping 15 matching lines @@
 
 namespace {
 
 class TestDialog : public DialogDelegateView, public ButtonListener {
  public:
   TestDialog()
       : input_(new views::Textfield()),
         canceled_(false),
         accepted_(false),
         closeable_(false),
-        last_pressed_button_(NULL) {
+        last_pressed_button_(nullptr),
+        should_handle_escape_(false) {
     AddChildView(input_);
   }
   ~TestDialog() override {}
 
+  void Init() {
+    // Add the accelerator before being added to the widget hierarchy (before
+    // DCV has registered its accelerator) to make sure accelerator handling is
+    // not dependent on the order of AddAccelerator calls.
+    EXPECT_FALSE(GetWidget());
+    AddAccelerator(ui::Accelerator(ui::VKEY_ESCAPE, ui::EF_NONE));
+  }
+
   // WidgetDelegate overrides:
   bool ShouldShowWindowTitle() const override {
     return !title_.empty();
   }
 
   // DialogDelegateView overrides:
   bool Cancel() override {
     canceled_ = true;
     return closeable_;
   }
   bool Accept() override {
     accepted_ = true;
     return closeable_;
   }
 
   // DialogDelegateView overrides:
   gfx::Size GetPreferredSize() const override { return gfx::Size(200, 200); }
+  bool AcceleratorPressed(const ui::Accelerator& accelerator) override {
+    return should_handle_escape_;
+  }
   base::string16 GetWindowTitle() const override { return title_; }
   View* GetInitiallyFocusedView() override { return input_; }
   bool UseNewStyleForThisDialog() const override { return true; }
 
   // ButtonListener override:
   void ButtonPressed(Button* sender, const ui::Event& event) override {
     last_pressed_button_ = sender;
   }
 
   Button* last_pressed_button() const { return last_pressed_button_; }
 
   void CheckAndResetStates(bool canceled, bool accepted, Button* last_pressed) {
     EXPECT_EQ(canceled, canceled_);
     canceled_ = false;
     EXPECT_EQ(accepted, accepted_);
     accepted_ = false;
     EXPECT_EQ(last_pressed, last_pressed_button_);
-    last_pressed_button_ = NULL;
+    last_pressed_button_ = nullptr;
   }
 
   void TearDown() {
     closeable_ = true;
     GetWidget()->Close();
   }
 
   void set_title(const base::string16& title) { title_ = title; }
+  void set_should_handle_escape(bool should_handle_escape) {
+    should_handle_escape_ = should_handle_escape;
+  }
 
   views::Textfield* input() { return input_; }
 
  private:
   views::Textfield* input_;
   bool canceled_;
   bool accepted_;
   // Prevent the dialog from closing, for repeated ok and cancel button clicks.
   bool closeable_;
   Button* last_pressed_button_;
   base::string16 title_;
+  bool should_handle_escape_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDialog);
 };
 
 class DialogTest : public ViewsTestBase {
  public:
-  DialogTest() : dialog_(NULL) {}
+  DialogTest() : dialog_(nullptr) {}
   ~DialogTest() override {}
 
   void SetUp() override {
     ViewsTestBase::SetUp();
     dialog_ = new TestDialog();
-    DialogDelegate::CreateDialogWidget(dialog_, GetContext(), NULL)->Show();
+    dialog_->Init();
+    DialogDelegate::CreateDialogWidget(dialog_, GetContext(), nullptr)->Show();
   }
 
   void TearDown() override {
     dialog_->TearDown();
     ViewsTestBase::TearDown();
   }
 
   void SimulateKeyEvent(const ui::KeyEvent& event) {
     ui::KeyEvent event_copy = event;
     if (dialog()->GetFocusManager()->OnKeyEvent(event_copy))
@@ skipping 19 matching lines @@
 TEST_F(DialogTest, AcceptAndCancel) {
   DialogClientView* client_view = dialog()->GetDialogClientView();
   LabelButton* ok_button = client_view->ok_button();
   LabelButton* cancel_button = client_view->cancel_button();
 
   // Check that return/escape accelerators accept/cancel dialogs.
   EXPECT_EQ(dialog()->input(), dialog()->GetFocusManager()->GetFocusedView());
   const ui::KeyEvent return_event(
       ui::ET_KEY_PRESSED, ui::VKEY_RETURN, ui::EF_NONE);
   SimulateKeyEvent(return_event);
-  dialog()->CheckAndResetStates(false, true, NULL);
+  dialog()->CheckAndResetStates(false, true, nullptr);
   const ui::KeyEvent escape_event(
       ui::ET_KEY_PRESSED, ui::VKEY_ESCAPE, ui::EF_NONE);
   SimulateKeyEvent(escape_event);
-  dialog()->CheckAndResetStates(true, false, NULL);
+  dialog()->CheckAndResetStates(true, false, nullptr);
 
   // Check ok and cancel button behavior on a directed return key events.
   ok_button->OnKeyPressed(return_event);
-  dialog()->CheckAndResetStates(false, true, NULL);
+  dialog()->CheckAndResetStates(false, true, nullptr);
   cancel_button->OnKeyPressed(return_event);
-  dialog()->CheckAndResetStates(true, false, NULL);
+  dialog()->CheckAndResetStates(true, false, nullptr);
 
   // Check that return accelerators cancel dialogs if cancel is focused.
   cancel_button->RequestFocus();
   EXPECT_EQ(cancel_button, dialog()->GetFocusManager()->GetFocusedView());
   SimulateKeyEvent(return_event);
-  dialog()->CheckAndResetStates(true, false, NULL);
+  dialog()->CheckAndResetStates(true, false, nullptr);
+
+  // Check that escape can be overridden.
+  dialog()->set_should_handle_escape(true);
+  SimulateKeyEvent(escape_event);
+  dialog()->CheckAndResetStates(false, false, nullptr);
 }
 
 TEST_F(DialogTest, RemoveDefaultButton) {
   // Removing buttons from the dialog here should not cause a crash on close.
   delete dialog()->GetDialogClientView()->ok_button();
   delete dialog()->GetDialogClientView()->cancel_button();
 }
 
 TEST_F(DialogTest, HitTest_HiddenTitle) {
   // Ensure that BubbleFrameView hit-tests as expected when the title is hidden.
@@ skipping 43 matching lines @@
   for (size_t i = 0; i < arraysize(cases); ++i) {
     gfx::Point point(cases[i].point, cases[i].point);
     EXPECT_EQ(cases[i].hit, frame->NonClientHitTest(point))
         << " with border: " << border << ", at point " << cases[i].point;
   }
 }
 
 TEST_F(DialogTest, BoundsAccommodateTitle) {
   TestDialog* dialog2(new TestDialog());
   dialog2->set_title(base::ASCIIToUTF16("Title"));
-  DialogDelegate::CreateDialogWidget(dialog2, GetContext(), NULL);
+  DialogDelegate::CreateDialogWidget(dialog2, GetContext(), nullptr);
 
   // Titled dialogs have taller initial frame bounds than untitled dialogs.
   View* frame1 = dialog()->GetWidget()->non_client_view()->frame_view();
   View* frame2 = dialog2->GetWidget()->non_client_view()->frame_view();
   EXPECT_LT(frame1->GetPreferredSize().height(),
             frame2->GetPreferredSize().height());
 
   // Giving the default test dialog a title will yield the same bounds.
   dialog()->set_title(base::ASCIIToUTF16("Title"));
   dialog()->GetWidget()->UpdateWindowTitle();
   EXPECT_EQ(frame1->GetPreferredSize().height(),
             frame2->GetPreferredSize().height());
 
   dialog2->TearDown();
 }
 
 // Tests default focus is assigned correctly when showing a new dialog.
 TEST_F(DialogTest, InitialFocus) {
   EXPECT_TRUE(dialog()->input()->HasFocus());
   EXPECT_EQ(dialog()->input(), dialog()->GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views