diff options
| author | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 16:29:59 +0000 |
|---|---|---|
| committer | bshe@chromium.org <bshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-19 16:29:59 +0000 |
| commit | 363b7ab54e301110dfb6c823a7a51d53871132af (patch) | |
| tree | 5627fffdd0d52943f57cc6b44ada2ee795c28ee3 /chrome/browser/notifications/desktop_notifications_unittest.cc | |
| parent | da9ea8806cb873eff6d6c2e6215f36514b62aa90 (diff) | |
| download | chromium_src-363b7ab54e301110dfb6c823a7a51d53871132af.zip chromium_src-363b7ab54e301110dfb6c823a7a51d53871132af.tar.gz chromium_src-363b7ab54e301110dfb6c823a7a51d53871132af.tar.bz2 | |
Add fade in animation for guest session and logged in user session
BUG=154859
Review URL: https://chromiumcodereview.appspot.com/12771012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189037 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/notifications/desktop_notifications_unittest.cc')
| -rw-r--r-- | chrome/browser/notifications/desktop_notifications_unittest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc index f762887..fbd71d26 100644 --- a/chrome/browser/notifications/desktop_notifications_unittest.cc +++ b/chrome/browser/notifications/desktop_notifications_unittest.cc @@ -27,6 +27,7 @@ #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" #include "ui/aura/env.h" #include "ui/aura/root_window.h" +#include "ui/compositor/scoped_animation_duration_scale_mode.h" #endif using content::BrowserThread; @@ -104,6 +105,8 @@ DesktopNotificationsTest::~DesktopNotificationsTest() { void DesktopNotificationsTest::SetUp() { #if defined(USE_ASH) WebKit::initialize(webkit_platform_support_.Get()); + ui::ScopedAnimationDurationScaleMode normal_duration_mode( + ui::ScopedAnimationDurationScaleMode::ZERO_DURATION); #if defined(ENABLE_MESSAGE_CENTER) // The message center is notmally initialized on |g_browser_process| which // is not created for these tests. |