content/renderer/render_view.cc - Issue 7840010: Revert 99810 - Get the rest of the chrome target to build (but not link) with USE_AURA.

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/render_view.cc

Issue 7840010: Revert 99810 - Get the rest of the chrome target to build (but not link) with USE_AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 3 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/render_view.cc

===================================================================

--- content/renderer/render_view.cc (revision 99812)

+++ content/renderer/render_view.cc (working copy)

@@ -3037,11 +3037,10 @@

bool in_process_plugin = RenderProcess::current()->UseInProcessPlugins();

if (in_process_plugin) {

-#if defined(OS_WIN) && !defined(USE_AURA)

+#if defined(OS_WIN) // In-proc plugins aren't supported on Linux or Mac.

return webkit::npapi::WebPluginDelegateImpl::Create(

file_path, mime_type, gfx::NativeViewFromId(host_window_));

#else

- // In-proc plugins aren't supported on non-Windows.

NOTIMPLEMENTED();

return NULL;

#endif

« no previous file with comments | « content/plugin/webplugin_delegate_stub.cc ('k') | ipc/ipc_message_utils.h » ('j') | no next file with comments »