diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 21:40:32 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-06 21:40:32 +0000 |
| commit | 7398dcc10a8029cfee85882f629e702449cc16b3 (patch) | |
| tree | 6339c562a65058297e0a10cb62f405221a752a65 /content/plugin | |
| parent | 409a271fa6c43f9aa93955acfcb6d970c76ac117 (diff) | |
| download | chromium_src-7398dcc10a8029cfee85882f629e702449cc16b3.zip chromium_src-7398dcc10a8029cfee85882f629e702449cc16b3.tar.gz chromium_src-7398dcc10a8029cfee85882f629e702449cc16b3.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
Review URL: http://codereview.chromium.org/7839002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
| -rw-r--r-- | content/plugin/webplugin_delegate_stub.cc | 4 |
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. |