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

Unified Diff: content/renderer/render_view.cc

Issue 7839002: Get most of the rest of chrome 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
« no previous file with comments | « content/plugin/webplugin_delegate_stub.cc ('k') | printing/printing.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_view.cc
===================================================================
--- content/renderer/render_view.cc (revision 99813)
+++ content/renderer/render_view.cc (working copy)
@@ -3037,10 +3037,11 @@
bool in_process_plugin = RenderProcess::current()->UseInProcessPlugins();
if (in_process_plugin) {
-#if defined(OS_WIN) // In-proc plugins aren't supported on Linux or Mac.
+#if defined(OS_WIN) && !defined(USE_AURA)
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') | printing/printing.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698