summaryrefslogtreecommitdiffstats
path: root/content/plugin/webplugin_proxy.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-06 22:55:28 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-06 22:55:28 +0000
commite5b307fe287acee54d60852addea15441243a4c7 (patch)
treec35a43d270d83f098645de8a73ee9b417efc813c /content/plugin/webplugin_proxy.h
parentef402c3ba1147c39ab8b1f803b7bf8ebf1bbdefe (diff)
downloadchromium_src-e5b307fe287acee54d60852addea15441243a4c7.zip
chromium_src-e5b307fe287acee54d60852addea15441243a4c7.tar.gz
chromium_src-e5b307fe287acee54d60852addea15441243a4c7.tar.bz2
Get Chrome to build & link with USE_AURA on Windows again.BUG=noneTEST=none
Review URL: http://codereview.chromium.org/8174005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104382 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin/webplugin_proxy.h')
-rw-r--r--content/plugin/webplugin_proxy.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h
index 54f8894..100c767 100644
--- a/content/plugin/webplugin_proxy.h
+++ b/content/plugin/webplugin_proxy.h
@@ -168,7 +168,7 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
virtual void URLRedirectResponse(bool allow, int resource_id);
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
// Retrieves the IME status from a windowless plug-in and sends it to a
// renderer process. A renderer process will convert the coordinates from
// local to the window coordinates and send the converted coordinates to a