content/browser/plugin_browsertest.cc - Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/plugin_browsertest.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/browser/plugin_browsertest.cc

diff --git a/content/browser/plugin_browsertest.cc b/content/browser/plugin_browsertest.cc

index 4fe4b132c7ecbaa6934a955baa0969b141266be4..9effe325deae04d183047fc23c8dd3888516fdd1 100644

--- a/content/browser/plugin_browsertest.cc

+++ b/content/browser/plugin_browsertest.cc

@@ -331,9 +331,10 @@ IN_PROC_BROWSER_TEST_F(PluginTest,

// If this flakes, reopen http://crbug.com/17645

// As of 6 July 2011, this test is flaky on Windows (perhaps due to timing out).

-#if !defined(OS_MACOSX)

+#if !defined(OS_MACOSX) && !defined(OS_LINUX)

// Disabled on Mac because the plugin side isn't implemented yet, see

// "TODO(port)" in plugin_javascript_open_popup.cc.

+// Disabled on Linux because we don't support NPAPI any more.

IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(OpenPopupWindowWithPlugin)) {

LoadAndWait(GetURL("get_javascript_open_popup_with_plugin.html"));

}

« no previous file with comments | « content/browser/gpu/test_support_gpu.gypi ('k') | content/browser/renderer_host/render_message_filter.cc » ('j') | no next file with comments »