| Index: ui/wm/core/window_animations.h
|
| diff --git a/ui/views/corewm/window_animations.h b/ui/wm/core/window_animations.h
|
| similarity index 69%
|
| rename from ui/views/corewm/window_animations.h
|
| rename to ui/wm/core/window_animations.h
|
| index f5728e6add64fc4ad60b8244540c8c6c28efec62..2c7997d9538a647ba306e278cd304a1ab8905ba3 100644
|
| --- a/ui/views/corewm/window_animations.h
|
| +++ b/ui/wm/core/window_animations.h
|
| @@ -2,12 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_VIEWS_COREWM_WINDOW_ANIMATIONS_H_
|
| -#define UI_VIEWS_COREWM_WINDOW_ANIMATIONS_H_
|
| +#ifndef UI_WM_CORE_WINDOW_ANIMATIONS_H_
|
| +#define UI_WM_CORE_WINDOW_ANIMATIONS_H_
|
|
|
| #include <vector>
|
|
|
| -#include "ui/views/views_export.h"
|
| +#include "ui/wm/core/wm_core_export.h"
|
|
|
| namespace aura {
|
| class Window;
|
| @@ -58,26 +58,26 @@ enum WindowVisibilityAnimationTransition {
|
|
|
| // These two methods use int for type rather than WindowVisibilityAnimationType
|
| // since downstream libraries can extend the set of animations.
|
| -VIEWS_EXPORT void SetWindowVisibilityAnimationType(aura::Window* window,
|
| - int type);
|
| -VIEWS_EXPORT int GetWindowVisibilityAnimationType(aura::Window* window);
|
| +WM_CORE_EXPORT void SetWindowVisibilityAnimationType(aura::Window* window,
|
| + int type);
|
| +WM_CORE_EXPORT int GetWindowVisibilityAnimationType(aura::Window* window);
|
|
|
| -VIEWS_EXPORT void SetWindowVisibilityAnimationTransition(
|
| +WM_CORE_EXPORT void SetWindowVisibilityAnimationTransition(
|
| aura::Window* window,
|
| WindowVisibilityAnimationTransition transition);
|
|
|
| -VIEWS_EXPORT bool HasWindowVisibilityAnimationTransition(
|
| +WM_CORE_EXPORT bool HasWindowVisibilityAnimationTransition(
|
| aura::Window* window,
|
| WindowVisibilityAnimationTransition transition);
|
|
|
| -VIEWS_EXPORT void SetWindowVisibilityAnimationDuration(
|
| +WM_CORE_EXPORT void SetWindowVisibilityAnimationDuration(
|
| aura::Window* window,
|
| const base::TimeDelta& duration);
|
|
|
| -VIEWS_EXPORT base::TimeDelta GetWindowVisibilityAnimationDuration(
|
| +WM_CORE_EXPORT base::TimeDelta GetWindowVisibilityAnimationDuration(
|
| const aura::Window& window);
|
|
|
| -VIEWS_EXPORT void SetWindowVisibilityAnimationVerticalPosition(
|
| +WM_CORE_EXPORT void SetWindowVisibilityAnimationVerticalPosition(
|
| aura::Window* window,
|
| float position);
|
|
|
| @@ -85,20 +85,21 @@ VIEWS_EXPORT void SetWindowVisibilityAnimationVerticalPosition(
|
| // associated with a Window so that the animation can continue after the Window
|
| // has been destroyed.
|
| // The returned object deletes itself when the animations are done.
|
| -VIEWS_EXPORT ui::ImplicitAnimationObserver* CreateHidingWindowAnimationObserver(
|
| - aura::Window* window);
|
| +WM_CORE_EXPORT ui::ImplicitAnimationObserver*
|
| + CreateHidingWindowAnimationObserver(aura::Window* window);
|
|
|
| // Returns false if the |window| didn't animate.
|
| -VIEWS_EXPORT bool AnimateOnChildWindowVisibilityChanged(aura::Window* window,
|
| - bool visible);
|
| -VIEWS_EXPORT bool AnimateWindow(aura::Window* window, WindowAnimationType type);
|
| +WM_CORE_EXPORT bool AnimateOnChildWindowVisibilityChanged(aura::Window* window,
|
| + bool visible);
|
| +WM_CORE_EXPORT bool AnimateWindow(aura::Window* window,
|
| + WindowAnimationType type);
|
|
|
| // Returns true if window animations are disabled for |window|. Window
|
| // animations are enabled by default. If |window| is NULL, this just checks
|
| // if the global flag disabling window animations is present.
|
| -VIEWS_EXPORT bool WindowAnimationsDisabled(aura::Window* window);
|
| +WM_CORE_EXPORT bool WindowAnimationsDisabled(aura::Window* window);
|
|
|
| } // namespace corewm
|
| } // namespace views
|
|
|
| -#endif // UI_VIEWS_COREWM_WINDOW_ANIMATIONS_H_
|
| +#endif // UI_WM_CORE_WINDOW_ANIMATIONS_H_
|
|
|