summaryrefslogtreecommitdiffstats
path: root/ash/shelf/shelf_tooltip_manager.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 22:36:00 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-12 22:36:00 +0000
commit067d7fe616a07011b9e2d2609fc65af8db6a7dfb (patch)
treec8692eee33741154a163ceeb3b90de02c88abb80 /ash/shelf/shelf_tooltip_manager.cc
parent436e8909ac51166cebfb03292a5bc05536d5b834 (diff)
downloadchromium_src-067d7fe616a07011b9e2d2609fc65af8db6a7dfb.zip
chromium_src-067d7fe616a07011b9e2d2609fc65af8db6a7dfb.tar.gz
chromium_src-067d7fe616a07011b9e2d2609fc65af8db6a7dfb.tar.bz2
Move wm/core to wm namespace.
Also sets up new targets for wm_core, wm_core_unittests, etc. R=sky@chromium.org TBR=sky@chromium.org BUG= Review URL: https://codereview.chromium.org/196063002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256680 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf/shelf_tooltip_manager.cc')
-rw-r--r--ash/shelf/shelf_tooltip_manager.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/shelf/shelf_tooltip_manager.cc b/ash/shelf/shelf_tooltip_manager.cc
index 48b943f..15afb08 100644
--- a/ash/shelf/shelf_tooltip_manager.cc
+++ b/ash/shelf/shelf_tooltip_manager.cc
@@ -324,8 +324,8 @@ void ShelfTooltipManager::CancelHidingAnimation() {
return;
gfx::NativeView native_view = widget_->GetNativeView();
- views::corewm::SetWindowVisibilityAnimationTransition(
- native_view, views::corewm::ANIMATE_NONE);
+ wm::SetWindowVisibilityAnimationTransition(
+ native_view, wm::ANIMATE_NONE);
}
void ShelfTooltipManager::CloseSoon() {
@@ -359,10 +359,10 @@ void ShelfTooltipManager::CreateBubble(views::View* anchor,
view_->SetText(text_);
gfx::NativeView native_view = widget_->GetNativeView();
- views::corewm::SetWindowVisibilityAnimationType(
- native_view, views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
- views::corewm::SetWindowVisibilityAnimationTransition(
- native_view, views::corewm::ANIMATE_HIDE);
+ wm::SetWindowVisibilityAnimationType(
+ native_view, wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL);
+ wm::SetWindowVisibilityAnimationTransition(
+ native_view, wm::ANIMATE_HIDE);
}
void ShelfTooltipManager::CreateTimer(int delay_in_ms) {