summaryrefslogtreecommitdiffstats
path: root/ash/system/tray
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/system/tray
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/system/tray')
-rw-r--r--ash/system/tray/tray_background_view.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc
index c610ee4..f6af7c8 100644
--- a/ash/system/tray/tray_background_view.cc
+++ b/ash/system/tray/tray_background_view.cc
@@ -493,13 +493,13 @@ void TrayBackgroundView::SetTrayBorder() {
void TrayBackgroundView::InitializeBubbleAnimations(
views::Widget* bubble_widget) {
- views::corewm::SetWindowVisibilityAnimationType(
+ wm::SetWindowVisibilityAnimationType(
bubble_widget->GetNativeWindow(),
- views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
- views::corewm::SetWindowVisibilityAnimationTransition(
+ wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
+ wm::SetWindowVisibilityAnimationTransition(
bubble_widget->GetNativeWindow(),
- views::corewm::ANIMATE_HIDE);
- views::corewm::SetWindowVisibilityAnimationDuration(
+ wm::ANIMATE_HIDE);
+ wm::SetWindowVisibilityAnimationDuration(
bubble_widget->GetNativeWindow(),
base::TimeDelta::FromMilliseconds(kAnimationDurationForPopupMS));
}