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

Unified Diff: webkit/plugins/npapi/test/plugin_windowless_test.cc

Issue 6902069: Increase warning level to 4 on Visual Studio (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixed remaining issues Created 9 years, 8 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 | « views/view_win.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/plugins/npapi/test/plugin_windowless_test.cc
diff --git a/webkit/plugins/npapi/test/plugin_windowless_test.cc b/webkit/plugins/npapi/test/plugin_windowless_test.cc
index 411f0260f49f6a0980b6b5b7d96da79d23abe038..33a91db28425eef5cfd8e5b434e70b16a2550ddb 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);
« no previous file with comments | « views/view_win.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698