summaryrefslogtreecommitdiffstats
path: root/webkit/plugins/npapi/test
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 02:04:11 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-03 02:04:11 +0000
commit942c3a60fab777c3bc83342a932b940f81ebdbb7 (patch)
treed5e6d82482c7e17a47411e55dc548763d5eaa6ce /webkit/plugins/npapi/test
parent413eb8709a131c09ad425f344e9a0eb200674393 (diff)
downloadchromium_src-942c3a60fab777c3bc83342a932b940f81ebdbb7.zip
chromium_src-942c3a60fab777c3bc83342a932b940f81ebdbb7.tar.gz
chromium_src-942c3a60fab777c3bc83342a932b940f81ebdbb7.tar.bz2
Increase warning level to 4 on Visual Studio
This requires disabling most /W4 warnings so the patch doesn't get too large. I still fixed a few bugs so I didn't have to disable some more serious warnings. Most of these warnings are already enabled on gcc so it's mostly windows-specific code that is affected. BUG=none TEST=none Review URL: http://codereview.chromium.org/6902069 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins/npapi/test')
-rw-r--r--webkit/plugins/npapi/test/plugin_windowless_test.cc9
1 files changed, 3 insertions, 6 deletions
diff --git a/webkit/plugins/npapi/test/plugin_windowless_test.cc b/webkit/plugins/npapi/test/plugin_windowless_test.cc
index 411f026..33a91db 100644
--- a/webkit/plugins/npapi/test/plugin_windowless_test.cc
+++ b/webkit/plugins/npapi/test/plugin_windowless_test.cc
@@ -49,14 +49,11 @@ static bool IsMouseUpEvent(NPEvent* np_event) {
#endif
}
+#if defined(OS_MACOSX)
static bool IsWindowActivationEvent(NPEvent* np_event) {
-#if defined(OS_WIN)
- NOTIMPLEMENTED();
- return false;
-#elif defined(OS_MACOSX)
return np_event->what == activateEvt;
-#endif
}
+#endif
bool WindowlessPluginTest::IsWindowless() const {
return true;
@@ -101,7 +98,7 @@ int16 WindowlessPluginTest::HandleEvent(void* event) {
} else if (test_name() == "multiple_instances_sync_calls") {
MultipleInstanceSyncCalls(browser);
}
-#if OS_MACOSX
+#if defined(OS_MACOSX)
} else if (IsWindowActivationEvent(np_event) &&
test_name() == "convert_point") {
ConvertPoint(browser);