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

Unified Diff: webkit/tools/test_shell/test_shell_platform_delegate_win.cc

Issue 337043: Let layout tests run on Windows 7. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 years, 2 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/test_shell/test_shell_platform_delegate_win.cc
===================================================================
--- webkit/tools/test_shell/test_shell_platform_delegate_win.cc (revision 30068)
+++ webkit/tools/test_shell/test_shell_platform_delegate_win.cc (working copy)
@@ -52,10 +52,11 @@
// default to XP metrics, override if on Vista
int requiredVScrollSize = 17;
int requiredFontSize = -11; // 8 pt
- const WCHAR *requiredFont = L"Tahoma";
+ const wchar_t* requiredFont = L"Tahoma";
+ // Consider Windows 7 as Vista.
bool isVista = false;
if (osvi.dwMajorVersion == 6
- && osvi.dwMinorVersion == 0
+ && (osvi.dwMinorVersion == 0 || osvi.dwMinorVersion == 1)
&& osvi.wProductType == VER_NT_WORKSTATION) {
requiredFont = L"Segoe UI";
requiredFontSize = -12; // 9 pt
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698