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/layout.h | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) (limited to 'chromium/ui/base/layout.h') diff --git a/chromium/ui/base/layout.h b/chromium/ui/base/layout.h index fd2627bbc50..e25289b3a48 100644 --- a/chromium/ui/base/layout.h +++ b/chromium/ui/base/layout.h @@ -7,10 +7,10 @@ #include +#include "base/component_export.h" #include "base/macros.h" #include "build/build_config.h" #include "ui/base/resource/scale_factor.h" -#include "ui/base/ui_base_export.h" #include "ui/gfx/native_widget_types.h" namespace ui { @@ -18,29 +18,32 @@ namespace ui { // Changes the value of GetSupportedScaleFactors() to |scale_factors|. // Use ScopedSetSupportedScaleFactors for unit tests as not to affect the // state of other tests. -UI_BASE_EXPORT void SetSupportedScaleFactors( - const std::vector& scale_factors); +COMPONENT_EXPORT(UI_BASE) +void SetSupportedScaleFactors(const std::vector& scale_factors); // Returns a vector with the scale factors which are supported by this // platform, in ascending order. -UI_BASE_EXPORT const std::vector& GetSupportedScaleFactors(); +COMPONENT_EXPORT(UI_BASE) +const std::vector& GetSupportedScaleFactors(); // Returns the supported ScaleFactor which most closely matches |scale|. // Converting from float to ScaleFactor is inefficient and should be done as // little as possible. -UI_BASE_EXPORT ScaleFactor GetSupportedScaleFactor(float image_scale); +COMPONENT_EXPORT(UI_BASE) +ScaleFactor GetSupportedScaleFactor(float image_scale); // Returns the ScaleFactor used by |view|. -UI_BASE_EXPORT float GetScaleFactorForNativeView(gfx::NativeView view); +COMPONENT_EXPORT(UI_BASE) +float GetScaleFactorForNativeView(gfx::NativeView view); // Returns true if the scale passed in is the list of supported scales for // the platform. -UI_BASE_EXPORT bool IsSupportedScale(float scale); +COMPONENT_EXPORT(UI_BASE) bool IsSupportedScale(float scale); namespace test { // Class which changes the value of GetSupportedScaleFactors() to // |new_scale_factors| for the duration of its lifetime. -class UI_BASE_EXPORT ScopedSetSupportedScaleFactors { +class COMPONENT_EXPORT(UI_BASE) ScopedSetSupportedScaleFactors { public: explicit ScopedSetSupportedScaleFactors( const std::vector& new_scale_factors); -- cgit v1.2.1