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

Unified Diff: content/test/plugin/plugin_javascript_open_popup.cc

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 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
Index: content/test/plugin/plugin_javascript_open_popup.cc
diff --git a/content/test/plugin/plugin_javascript_open_popup.cc b/content/test/plugin/plugin_javascript_open_popup.cc
index 761f9eb47d5cc2b131b44a87eb3ebec45e4b5bbc..0b8daf8280ceca7a0770bf8dce0ea4d288f0d614 100644
--- a/content/test/plugin/plugin_javascript_open_popup.cc
+++ b/content/test/plugin/plugin_javascript_open_popup.cc
@@ -7,9 +7,6 @@
#include "build/build_config.h"
#include "base/logging.h"
-#if defined(USE_X11)
-#include "third_party/npapi/bindings/npapi_x11.h"
-#endif
#include "content/test/plugin/plugin_client.h"
namespace NPAPIClient {
@@ -75,33 +72,6 @@ bool ExecuteJavascriptPopupWindowTargetPluginTest::CheckWindow(
return false;
}
-#elif defined(USE_X11)
-// This code blindly follows the same sorts of verifications done on
-// the Windows side. Does it make sense on X? Maybe not really, but
-// it can't hurt to do extra validations.
-bool ExecuteJavascriptPopupWindowTargetPluginTest::CheckWindow(
- NPWindow* window) {
- Window xwindow = reinterpret_cast<Window>(window->window);
- // Grab a pointer to the extra SetWindow data so we can grab the display out.
- NPSetWindowCallbackStruct* extra =
- static_cast<NPSetWindowCallbackStruct*>(window->ws_info);
-
- if (xwindow) {
- Window root, parent;
- Window* wins = NULL;
- unsigned int num_child;
- Status status = XQueryTree(extra->display, xwindow, &root, &parent,
- &wins, &num_child);
- if (wins)
- XFree(wins);
- DCHECK(status != 0);
- if (!parent || parent == root)
- SetError("Windowed plugin instantiated with NULL parent");
- return true;
- }
-
- return false;
-}
#elif defined(OS_MACOSX)
bool ExecuteJavascriptPopupWindowTargetPluginTest::CheckWindow(
NPWindow* window) {
« no previous file with comments | « content/shell/renderer/test_runner/key_code_mapping.cc ('k') | content/test/plugin/plugin_windowless_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698