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

Unified Diff: ash/test/ash_test_helper_unittest.cc

Issue 178883004: Enable the volume slider in Ash for windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix COM initialization errors (the right way). Created 6 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 | « ash/system/win/audio/tray_audio_win.cc ('k') | ash/test/test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/test/ash_test_helper_unittest.cc
diff --git a/ash/test/ash_test_helper_unittest.cc b/ash/test/ash_test_helper_unittest.cc
index 52e73fb9a79687ee514151d9f29337b170c08570..547cafa82db0aa157a9cb82e9589f6eb2422c599 100644
--- a/ash/test/ash_test_helper_unittest.cc
+++ b/ash/test/ash_test_helper_unittest.cc
@@ -8,6 +8,10 @@
#include "ui/aura/window_event_dispatcher.h"
#include "ui/views/widget/widget.h"
+#if defined(OS_WIN)
+#include "base/win/windows_version.h"
+#endif
+
// Tests for AshTestHelper. Who will watch the watchers? And who will test
// the tests?
class AshTestHelperTest : public testing::Test {
@@ -40,6 +44,11 @@ class AshTestHelperTest : public testing::Test {
// Ensure that we have initialized enough of Ash to create and show a window.
TEST_F(AshTestHelperTest, AshTestHelper) {
// Check initial state.
+#if defined(OS_WIN)
+ // Ash doesn't run on versions of Windows prior to Win7.
+ if (base::win::GetVersion() < base::win::VERSION_WIN7)
+ return;
+#endif
EXPECT_TRUE(ash_test_helper()->message_loop());
EXPECT_TRUE(ash_test_helper()->test_shell_delegate());
EXPECT_TRUE(ash_test_helper()->CurrentContext());
« no previous file with comments | « ash/system/win/audio/tray_audio_win.cc ('k') | ash/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698