diff options
| author | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 16:07:12 +0000 |
|---|---|---|
| committer | dmichael@chromium.org <dmichael@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-13 16:07:12 +0000 |
| commit | 39dd9bc271d69d85d3189847b01e911d8ac7aeda (patch) | |
| tree | fd3c3a40714a2b2dae82b2466517969138024d45 /ash/shelf/shelf_tooltip_manager.cc | |
| parent | 9a6cfefacd9f3509fd3b85f453fb4e5dd1f001d7 (diff) | |
| download | chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.zip chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.tar.gz chromium_src-39dd9bc271d69d85d3189847b01e911d8ac7aeda.tar.bz2 | |
Revert "Move wm/core to wm namespace."
This reverts commit 521c703f8d62fa698c3e88287c64d8d23f9ac675.
Broke gyp
BUG=
Review URL: https://codereview.chromium.org/199263002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256846 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shelf/shelf_tooltip_manager.cc')
| -rw-r--r-- | ash/shelf/shelf_tooltip_manager.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ash/shelf/shelf_tooltip_manager.cc b/ash/shelf/shelf_tooltip_manager.cc index 15afb08..48b943f 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(); - wm::SetWindowVisibilityAnimationTransition( - native_view, wm::ANIMATE_NONE); + views::corewm::SetWindowVisibilityAnimationTransition( + native_view, views::corewm::ANIMATE_NONE); } void ShelfTooltipManager::CloseSoon() { @@ -359,10 +359,10 @@ void ShelfTooltipManager::CreateBubble(views::View* anchor, view_->SetText(text_); gfx::NativeView native_view = widget_->GetNativeView(); - wm::SetWindowVisibilityAnimationType( - native_view, wm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL); - wm::SetWindowVisibilityAnimationTransition( - native_view, wm::ANIMATE_HIDE); + views::corewm::SetWindowVisibilityAnimationType( + native_view, views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_VERTICAL); + views::corewm::SetWindowVisibilityAnimationTransition( + native_view, views::corewm::ANIMATE_HIDE); } void ShelfTooltipManager::CreateTimer(int delay_in_ms) { |