summaryrefslogtreecommitdiffstats
path: root/content/plugin
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 20:52:50 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 20:52:50 +0000
commit6bd91debb17f5790401f3a28da1d71bc0d1a83ce (patch)
treefd86ea2aff3a25c886c4dcb66ba70b01a6131ef6 /content/plugin
parent718a86efff263d7fab036cc2ec90d463b4fb3fd6 (diff)
downloadchromium_src-6bd91debb17f5790401f3a28da1d71bc0d1a83ce.zip
chromium_src-6bd91debb17f5790401f3a28da1d71bc0d1a83ce.tar.gz
chromium_src-6bd91debb17f5790401f3a28da1d71bc0d1a83ce.tar.bz2
Get the rest of the chrome target to build (but not link) with USE_AURA.
http://crbug.com/93947 TEST=none Review URL: http://codereview.chromium.org/7839002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99810 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
-rw-r--r--content/plugin/webplugin_delegate_stub.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index 824cd47..9a6fdbc 100644
--- a/content/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -162,7 +162,9 @@ void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params,
command_line.GetSwitchValuePath(switches::kPluginPath);
gfx::PluginWindowHandle parent = gfx::kNullPluginWindow;
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+ // Nothing.
+#elif defined(OS_WIN)
parent = gfx::NativeViewFromId(params.containing_window);
#elif defined(OS_LINUX)
// This code is disabled, See issue 17110.