summaryrefslogtreecommitdiffstats
path: root/content/plugin
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 21:01:09 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-06 21:01:09 +0000
commit0a670edfacc27f9d1ec85c2764bc81a955ab15f8 (patch)
treed6577ddaa8ad90bc030776e64f6b42c4b58c2a50 /content/plugin
parenta733898942fc96ec09b7ddacef6152051390317f (diff)
downloadchromium_src-0a670edfacc27f9d1ec85c2764bc81a955ab15f8.zip
chromium_src-0a670edfacc27f9d1ec85c2764bc81a955ab15f8.tar.gz
chromium_src-0a670edfacc27f9d1ec85c2764bc81a955ab15f8.tar.bz2
Revert 99810 - 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 TBR=ben@chromium.org Review URL: http://codereview.chromium.org/7840010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99813 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
-rw-r--r--content/plugin/webplugin_delegate_stub.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index 9a6fdbc..824cd47 100644
--- a/content/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -162,9 +162,7 @@ void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params,
command_line.GetSwitchValuePath(switches::kPluginPath);
gfx::PluginWindowHandle parent = gfx::kNullPluginWindow;
-#if defined(USE_AURA)
- // Nothing.
-#elif defined(OS_WIN)
+#if defined(OS_WIN)
parent = gfx::NativeViewFromId(params.containing_window);
#elif defined(OS_LINUX)
// This code is disabled, See issue 17110.