Use DialogDelegate for kAnchoredDialogKey

Prerequisite for focus traversal into anchored DialogDelegates. There
are currently none of those as anchor functionality is in
BubbleDialogDelegate.

Bug: 1144829
Change-Id: I6dcfd11cdae4f74b79190ec6461437a05200ddc3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2514664
Commit-Queue: Peter Boström <pbos@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Cr-Commit-Position: refs/heads/master@{#823792}

chrome/browser/ui/views/accessibility/caption_bubble.cc

@@ -486,7 +486,7 @@ void CaptionBubble::AddedToWidget() {
       anchor_widget()->GetFocusTraversable());
   GetWidget()->SetFocusTraversableParentView(GetAnchorView());
   GetAnchorView()->SetProperty(views::kAnchoredDialogKey,
-                               static_cast<BubbleDialogDelegate*>(this));
+                               static_cast<DialogDelegate*>(this));
 }
 
 void CaptionBubble::CloseButtonPressed() {

chrome/browser/ui/views/extensions/extensions_menu_view_browsertest.cc

@@ -149,7 +149,7 @@ class ExtensionsMenuViewBrowserTest : public ExtensionsToolbarBrowserTest {
     if (ui_test_name_ == "InstallDialog") {
       ExtensionsToolbarContainer* const container =
           GetExtensionsToolbarContainer();
-      views::BubbleDialogDelegate* const install_bubble =
+      views::DialogDelegate* const install_bubble =
           container->GetViewForId(extensions()[0]->id())
               ->GetProperty(views::kAnchoredDialogKey);
       ASSERT_TRUE(install_bubble);
@@ -165,7 +165,7 @@ class ExtensionsMenuViewBrowserTest : public ExtensionsToolbarBrowserTest {
     ExtensionsToolbarContainer* const container =
         GetExtensionsToolbarContainer();
     // Accept or cancel the dialog.
-    views::BubbleDialogDelegate* const uninstall_bubble =
+    views::DialogDelegate* const uninstall_bubble =
         container->GetViewForId(extensions()[0]->id())
             ->GetProperty(views::kAnchoredDialogKey);
     ASSERT_TRUE(uninstall_bubble);

chrome/browser/ui/views/frame/browser_view.cc

@@ -1583,7 +1583,7 @@ bool BrowserView::ActivateFirstInactiveBubbleForAccessibility() {
   // general solution should be desirable to find any bubbles anchored in the
   // views hierarchy.
   if (toolbar_ && toolbar_->app_menu_button()) {
-    views::BubbleDialogDelegate* bubble =
+    views::DialogDelegate* bubble =
         toolbar_->app_menu_button()->GetProperty(views::kAnchoredDialogKey);
     if (!bubble && GetLocationBarView())
       bubble = GetLocationBarView()->GetProperty(views::kAnchoredDialogKey);

ui/views/bubble/bubble_dialog_delegate_view.cc

@@ -697,7 +697,8 @@ void BubbleDialogDelegate::SetAnchorView(View* anchor_view) {
     auto* old_anchored_dialog = anchor_view->GetProperty(kAnchoredDialogKey);
     if (old_anchored_dialog && old_anchored_dialog != this)
       DLOG(WARNING) << "|anchor_view| has already anchored a focusable widget.";
-    anchor_view->SetProperty(kAnchoredDialogKey, this);
+    anchor_view->SetProperty(kAnchoredDialogKey,
+                             static_cast<DialogDelegate*>(this));
   }
 }
 

ui/views/focus/focus_search.cc

@@ -6,11 +6,11 @@
 
 #include "base/logging.h"
 #include "build/build_config.h"
-#include "ui/views/bubble/bubble_dialog_delegate_view.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/view.h"
 #include "ui/views/view_class_properties.h"
 #include "ui/views/widget/widget.h"
+#include "ui/views/window/dialog_delegate.h"
 
 namespace views {
 
@@ -203,8 +203,7 @@ View* FocusSearch::FindNextFocusableViewImpl(
     // Check to see if we should navigate into a dialog anchored at this view.
     if (can_go_into_anchored_dialog ==
         AnchoredDialogPolicy::kCanGoIntoAnchoredDialog) {
-      BubbleDialogDelegate* bubble =
-          starting_view->GetProperty(kAnchoredDialogKey);
+      DialogDelegate* bubble = starting_view->GetProperty(kAnchoredDialogKey);
       if (bubble) {
         *focus_traversable = bubble->GetWidget()->GetFocusTraversable();
         *focus_traversable_view = starting_view;
@@ -230,7 +229,7 @@ View* FocusSearch::FindNextFocusableViewImpl(
     while (parent && parent != root_) {
       if (can_go_into_anchored_dialog ==
           AnchoredDialogPolicy::kCanGoIntoAnchoredDialog) {
-        BubbleDialogDelegate* bubble = parent->GetProperty(kAnchoredDialogKey);
+        DialogDelegate* bubble = parent->GetProperty(kAnchoredDialogKey);
         if (bubble) {
           *focus_traversable = bubble->GetWidget()->GetFocusTraversable();
           *focus_traversable_view = starting_view;
@@ -301,8 +300,7 @@ View* FocusSearch::FindPreviousFocusableViewImpl(
     // Check to see if we should navigate into a dialog anchored at this view.
     if (can_go_into_anchored_dialog ==
         AnchoredDialogPolicy::kCanGoIntoAnchoredDialog) {
-      BubbleDialogDelegate* bubble =
-          starting_view->GetProperty(kAnchoredDialogKey);
+      DialogDelegate* bubble = starting_view->GetProperty(kAnchoredDialogKey);
       if (bubble) {
         *focus_traversable = bubble->GetWidget()->GetFocusTraversable();
         *focus_traversable_view = starting_view;

ui/views/view_class_properties.cc

@@ -19,8 +19,7 @@ DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, int)
 
 DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, gfx::Insets*)
 
-DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT,
-                                       views::BubbleDialogDelegate*)
+DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, views::DialogDelegate*)
 
 DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT,
                                        views::HighlightPathGenerator*)
@@ -32,7 +31,7 @@ namespace views {
 DEFINE_UI_CLASS_PROPERTY_KEY(int, kHitTestComponentKey, HTNOWHERE)
 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Insets, kMarginsKey, nullptr)
 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(gfx::Insets, kInternalPaddingKey, nullptr)
-DEFINE_UI_CLASS_PROPERTY_KEY(views::BubbleDialogDelegate*,
+DEFINE_UI_CLASS_PROPERTY_KEY(views::DialogDelegate*,
                              kAnchoredDialogKey,
                              nullptr)
 DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(views::HighlightPathGenerator,

ui/views/view_class_properties.h

@@ -15,7 +15,7 @@ class Insets;
 
 namespace views {
 
-class BubbleDialogDelegate;
+class DialogDelegate;
 class FlexSpecification;
 class HighlightPathGenerator;
 
@@ -42,7 +42,7 @@ VIEWS_EXPORT extern const ui::ClassProperty<gfx::Insets*>* const
 
 // A property to store the bubble dialog anchored to this view, to
 // enable the bubble's contents to be included in the focus order.
-VIEWS_EXPORT extern const ui::ClassProperty<BubbleDialogDelegate*>* const
+VIEWS_EXPORT extern const ui::ClassProperty<DialogDelegate*>* const
     kAnchoredDialogKey;
 
 // A property to store a highlight-path generator. This generator is used to
@@ -66,8 +66,7 @@ VIEWS_EXPORT extern const ui::ClassProperty<LayoutAlignment*>* const
 // template instance before its specialization is declared in a
 // translation unit is a C++ error.
 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, gfx::Insets*)
-DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT,
-                                        views::BubbleDialogDelegate*)
+DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, views::DialogDelegate*)
 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT,
                                         views::HighlightPathGenerator*)
 DECLARE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, views::FlexSpecification*)