summaryrefslogtreecommitdiffstats
path: root/ash/launcher/launcher_tooltip_manager.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-28 22:24:34 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-28 22:24:34 +0000
commitf82017820fe06b6dd5fe5a782919971c9e8ff7f4 (patch)
tree9c7e728b90c24fdb8ea3d51c8b522593e0994841 /ash/launcher/launcher_tooltip_manager.cc
parent664b93c14564c47d4c99cee4a6d14d2386ccbf3f (diff)
downloadchromium_src-f82017820fe06b6dd5fe5a782919971c9e8ff7f4.zip
chromium_src-f82017820fe06b6dd5fe5a782919971c9e8ff7f4.tar.gz
chromium_src-f82017820fe06b6dd5fe5a782919971c9e8ff7f4.tar.bz2
Split window_animations, moving basic animations to views/corewm.
The base definition of the animation type enum also moves to corewm, and the API now allows downstream libraries (like ash) to extend the set of animations available. This will allow us to more easily use "core" animations in desktop-aura. I also removed the internal namespace from window_animations that remained in ash, since the use of namespaces in that file had begun to confuse me. http://crbug.com/158115 R=sky@chromium.org Review URL: https://codereview.chromium.org/11412223 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170071 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/launcher/launcher_tooltip_manager.cc')
-rw-r--r--ash/launcher/launcher_tooltip_manager.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/ash/launcher/launcher_tooltip_manager.cc b/ash/launcher/launcher_tooltip_manager.cc
index 047aabf..4263bd6 100644
--- a/ash/launcher/launcher_tooltip_manager.cc
+++ b/ash/launcher/launcher_tooltip_manager.cc
@@ -348,7 +348,8 @@ void LauncherTooltipManager::CancelHidingAnimation() {
return;
gfx::NativeView native_view = widget_->GetNativeView();
- SetWindowVisibilityAnimationTransition(native_view, ANIMATE_NONE);
+ views::corewm::SetWindowVisibilityAnimationTransition(
+ native_view, views::corewm::ANIMATE_NONE);
}
void LauncherTooltipManager::CloseSoon() {
@@ -376,9 +377,10 @@ void LauncherTooltipManager::CreateBubble(views::View* anchor,
view_->SetText(text_);
gfx::NativeView native_view = widget_->GetNativeView();
- SetWindowVisibilityAnimationType(
- native_view, WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
- SetWindowVisibilityAnimationTransition(native_view, ANIMATE_HIDE);
+ views::corewm::SetWindowVisibilityAnimationType(
+ native_view, views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
+ views::corewm::SetWindowVisibilityAnimationTransition(
+ native_view, views::corewm::ANIMATE_HIDE);
}
} // namespace internal