content/renderer/npapi/webplugin_delegate_proxy.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/renderer/npapi/webplugin_delegate_proxy.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/renderer/npapi/webplugin_delegate_proxy.cc

diff --git a/content/renderer/npapi/webplugin_delegate_proxy.cc b/content/renderer/npapi/webplugin_delegate_proxy.cc

index 1a78e767f00d09f6fbe2178554ae78ffb2b73a39..e578b27a7f3444bea3b938c4160f7d3236c8eff1 100644

--- a/content/renderer/npapi/webplugin_delegate_proxy.cc

+++ b/content/renderer/npapi/webplugin_delegate_proxy.cc

@@ -4,10 +4,6 @@

#include "content/renderer/npapi/webplugin_delegate_proxy.h"

-#if defined(USE_X11)

-#include <cairo/cairo.h>

-#endif

#include <algorithm>

#include "base/auto_reset.h"

@@ -652,7 +648,7 @@ bool WebPluginDelegateProxy::CreateSharedBitmap(

if (!memory->get())

return false;

#endif

-#if defined(OS_POSIX) && !defined(TOOLKIT_GTK) && !defined(OS_ANDROID)

+#if defined(OS_POSIX) && !defined(OS_ANDROID)

TransportDIB::Handle handle;

IPC::Message* msg = new ViewHostMsg_AllocTransportDIB(size, false, &handle);

if (!RenderThreadImpl::current()->Send(msg))

« no previous file with comments | « content/public/test/mock_render_process_host.cc ('k') | content/renderer/npapi/webplugin_impl.cc » ('j') | no next file with comments »