summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/background
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 /chrome/browser/chromeos/background
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 'chrome/browser/chromeos/background')
-rw-r--r--chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
index 69c285f..81b53b6 100644
--- a/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
+++ b/chrome/browser/chromeos/background/ash_user_wallpaper_delegate.cc
@@ -47,7 +47,7 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
virtual int GetAnimationType() OVERRIDE {
return ShouldShowInitialAnimation() ?
ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE :
- static_cast<int>(views::corewm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
+ static_cast<int>(wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
}
virtual int GetAnimationDurationOverride() OVERRIDE {