Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5214)

Unified Diff: chrome/common/render_messages.h

Issue 7850026: Aura under Linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge conflict resolved Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/common/render_messages.h
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index b32e7fc328654592b017aa89568a141651c69359..99836fc282f0a5ec5096a0df31cd47c74b5d5c83 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

Powered by Google App Engine
This is Rietveld 408576698