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-13 15:31:49 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-13 15:31:49 +0000
commit521c703f8d62fa698c3e88287c64d8d23f9ac675 (patch)
tree2e50833697a511a3cbc1f589fc4e17d466b82f03 /ash/shelf/shelf_tooltip_manager.cc
parent46e49bdb2dcac1f906d01c8373e9fc3c8ce2186c (diff)
downloadchromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.zip
chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.tar.gz
chromium_src-521c703f8d62fa698c3e88287c64d8d23f9ac675.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= Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256680 Review URL: https://codereview.chromium.org/196063002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256839 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) {