From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 12 Oct 2020 14:27:29 +0200 Subject: BASELINE: Update Chromium to 85.0.4183.140 Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen --- chromium/ui/views/view_class_properties.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'chromium/ui/views/view_class_properties.cc') diff --git a/chromium/ui/views/view_class_properties.cc b/chromium/ui/views/view_class_properties.cc index 0409ce2d73b..1dec102808a 100644 --- a/chromium/ui/views/view_class_properties.cc +++ b/chromium/ui/views/view_class_properties.cc @@ -20,7 +20,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::BubbleDialogDelegateView*) + views::BubbleDialogDelegate*) DEFINE_EXPORTED_UI_CLASS_PROPERTY_TYPE(VIEWS_EXPORT, views::HighlightPathGenerator*) @@ -31,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::BubbleDialogDelegateView*, +DEFINE_UI_CLASS_PROPERTY_KEY(views::BubbleDialogDelegate*, kAnchoredDialogKey, nullptr) DEFINE_OWNED_UI_CLASS_PROPERTY_KEY(views::HighlightPathGenerator, -- cgit v1.2.1