Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(533)

Unified Diff: ui/gfx/animation/animation_unittest.cc

Issue 1061733002: Remove windows/mac/ios specific code from //ui (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: fix default try set Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/animation/animation.cc ('k') | ui/gfx/animation/tween.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/animation/animation_unittest.cc
diff --git a/ui/gfx/animation/animation_unittest.cc b/ui/gfx/animation/animation_unittest.cc
index 779e3ecd78cb0e155a3886a42b21b3e241c517a3..d9f30186a399d25d88753cc6d50af9d13170b71d 100644
--- a/ui/gfx/animation/animation_unittest.cc
+++ b/ui/gfx/animation/animation_unittest.cc
@@ -7,10 +7,6 @@
#include "ui/gfx/animation/linear_animation.h"
#include "ui/gfx/animation/test_animation_delegate.h"
-#if defined(OS_WIN)
-#include "base/win/windows_version.h"
-#endif
-
namespace gfx {
class AnimationTest: public testing::Test {
@@ -125,22 +121,7 @@ TEST_F(AnimationTest, DeleteFromEnd) {
}
TEST_F(AnimationTest, ShouldRenderRichAnimation) {
-#if defined(OS_WIN)
- if (base::win::GetVersion() >= base::win::VERSION_VISTA) {
- BOOL result;
- ASSERT_NE(
- 0, ::SystemParametersInfo(SPI_GETCLIENTAREAANIMATION, 0, &result, 0));
- // ShouldRenderRichAnimation() should check the SPI_GETCLIENTAREAANIMATION
- // value on Vista.
- EXPECT_EQ(!!result, Animation::ShouldRenderRichAnimation());
- } else {
- // On XP, the function should check the SM_REMOTESESSION value.
- EXPECT_EQ(!::GetSystemMetrics(SM_REMOTESESSION),
- Animation::ShouldRenderRichAnimation());
- }
-#else
EXPECT_TRUE(Animation::ShouldRenderRichAnimation());
-#endif
}
// Test that current value is always 0 after Start() is called.
« no previous file with comments | « ui/gfx/animation/animation.cc ('k') | ui/gfx/animation/tween.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698