summaryrefslogtreecommitdiffstats
path: root/chrome/common
diff options
context:
space:
mode:
authorsaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-18 17:28:50 +0000
committersaintlou@chromium.org <saintlou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-18 17:28:50 +0000
commit3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea (patch)
tree84794a37e500c230cb702d38aed4f3363afe755f /chrome/common
parent97fe97e78d76db3c5a0ee7c1baa06d1fcd082a1a (diff)
downloadchromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.zip
chromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.tar.gz
chromium_src-3fa441d238ffa7b2cfbc4c7b623f8cb00b7c18ea.tar.bz2
Aura under Linux is enabled with:
'use_aura': 1, BUG=none TEST=none Review URL: http://codereview.chromium.org/7850026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r--chrome/common/render_messages.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index b32e7fc..7d92fa2 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -52,7 +52,7 @@ enum ViewHostMsg_JavaScriptStressTestControl_Commands {
namespace IPC {
-#if defined(OS_POSIX)
+#if defined(OS_POSIX) && !defined(USE_AURA)
// TODO(port): this shouldn't exist. However, the plugin stuff is really using
// HWNDS (NativeView), and making Windows calls based on them. I've not figured
@@ -75,7 +75,7 @@ struct ParamTraits<gfx::NativeView> {
}
};
-#endif // defined(OS_POSIX)
+#endif // defined(OS_POSIX) && !defined(USE_AURA)
template <>
struct ParamTraits<ContentSettings> {