diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-12 14:27:29 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-10-13 09:35:20 +0000 |
| commit | c30a6232df03e1efbd9f3b226777b07e087a1122 (patch) | |
| tree | e992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/ui/base/cocoa/constrained_window | |
| parent | 7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff) | |
| download | qtwebengine-chromium-85-based.tar.gz | |
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/ui/base/cocoa/constrained_window')
| -rw-r--r-- | chromium/ui/base/cocoa/constrained_window/constrained_window_animation.h | 10 | ||||
| -rw-r--r-- | chromium/ui/base/cocoa/constrained_window/constrained_window_animation.mm | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/chromium/ui/base/cocoa/constrained_window/constrained_window_animation.h b/chromium/ui/base/cocoa/constrained_window/constrained_window_animation.h index 2bc672c9840..8942102b232 100644 --- a/chromium/ui/base/cocoa/constrained_window/constrained_window_animation.h +++ b/chromium/ui/base/cocoa/constrained_window/constrained_window_animation.h @@ -7,11 +7,11 @@ #import <Cocoa/Cocoa.h> +#include "base/component_export.h" #include "base/mac/scoped_nsobject.h" -#include "ui/base/ui_base_export.h" // Base class for all constrained window animation classes. -UI_BASE_EXPORT +COMPONENT_EXPORT(UI_BASE) @interface ConstrainedWindowAnimationBase : NSAnimation { @protected base::scoped_nsobject<NSWindow> _window; @@ -22,17 +22,17 @@ UI_BASE_EXPORT @end // An animation to show a window. -UI_BASE_EXPORT +COMPONENT_EXPORT(UI_BASE) @interface ConstrainedWindowAnimationShow : ConstrainedWindowAnimationBase @end // An animation to hide a window. -UI_BASE_EXPORT +COMPONENT_EXPORT(UI_BASE) @interface ConstrainedWindowAnimationHide : ConstrainedWindowAnimationBase @end // An animation that pulses the window by growing it then shrinking it back. -UI_BASE_EXPORT +COMPONENT_EXPORT(UI_BASE) @interface ConstrainedWindowAnimationPulse : ConstrainedWindowAnimationBase @end diff --git a/chromium/ui/base/cocoa/constrained_window/constrained_window_animation.mm b/chromium/ui/base/cocoa/constrained_window/constrained_window_animation.mm index ce16e17dfcb..c8ce99f708b 100644 --- a/chromium/ui/base/cocoa/constrained_window/constrained_window_animation.mm +++ b/chromium/ui/base/cocoa/constrained_window/constrained_window_animation.mm @@ -11,6 +11,7 @@ #include "base/location.h" #import "base/mac/foundation_util.h" #include "base/native_library.h" +#include "base/notreached.h" #include "base/stl_util.h" #include "ui/gfx/animation/tween.h" |