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/base/window_open_disposition.h | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'chromium/ui/base/window_open_disposition.h') diff --git a/chromium/ui/base/window_open_disposition.h b/chromium/ui/base/window_open_disposition.h index 930024e8300..ef07e966a05 100644 --- a/chromium/ui/base/window_open_disposition.h +++ b/chromium/ui/base/window_open_disposition.h @@ -5,7 +5,7 @@ #ifndef UI_BASE_WINDOW_OPEN_DISPOSITION_H_ #define UI_BASE_WINDOW_OPEN_DISPOSITION_H_ -#include "ui/base/ui_base_export.h" +#include "base/component_export.h" // DEPRECATED: Instead of introducing new references to this enum, use // the generated ui::mojom::WindowOpenDisposition in @@ -41,20 +41,22 @@ namespace ui { // suggest opening in the current tab; for example, a caller could set this to // NEW_FOREGROUND_TAB to prevent a click from overwriting the current tab by // default. -UI_BASE_EXPORT WindowOpenDisposition -DispositionFromClick(bool middle_button, - bool alt_key, - bool ctrl_key, - bool meta_key, - bool shift_key, - WindowOpenDisposition disposition_for_current_tab = - WindowOpenDisposition::CURRENT_TAB); +COMPONENT_EXPORT(UI_BASE) +WindowOpenDisposition DispositionFromClick( + bool middle_button, + bool alt_key, + bool ctrl_key, + bool meta_key, + bool shift_key, + WindowOpenDisposition disposition_for_current_tab = + WindowOpenDisposition::CURRENT_TAB); // As with DispositionFromClick(), but using |event_flags| as in ui::MouseEvent. -UI_BASE_EXPORT WindowOpenDisposition -DispositionFromEventFlags(int event_flags, - WindowOpenDisposition disposition_for_current_tab = - WindowOpenDisposition::CURRENT_TAB); +COMPONENT_EXPORT(UI_BASE) +WindowOpenDisposition DispositionFromEventFlags( + int event_flags, + WindowOpenDisposition disposition_for_current_tab = + WindowOpenDisposition::CURRENT_TAB); } // namespace ui -- cgit v1.2.1