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

Unified Diff: ipc/ipc_message_utils.h

Issue 7840010: Revert 99810 - Get the rest of the chrome target to build (but not link) with USE_AURA. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « content/renderer/render_view.cc ('k') | printing/printing.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_message_utils.h
===================================================================
--- ipc/ipc_message_utils.h (revision 99812)
+++ ipc/ipc_message_utils.h (working copy)
@@ -20,10 +20,6 @@
#include "ipc/ipc_param_traits.h"
#include "ipc/ipc_sync_message.h"
-#if defined(USE_AURA)
-#include "ui/gfx/native_widget_types.h"
-#endif
-
#if defined(COMPILER_GCC)
// GCC "helpfully" tries to inline template methods in release mode. Except we
// want the majority of the template junk being expanded once in the
@@ -663,13 +659,9 @@
}
};
-#if defined(USE_AURA)
-// TODO(beng): Figure out why this is needed, fix that issue and remove
-// this. Brett and I were unable to figure out why, but he
-// thought this should be harmless.
template <>
-struct ParamTraits<gfx::PluginWindowHandle> {
- typedef gfx::PluginWindowHandle param_type;
+struct ParamTraits<HCURSOR> {
+ typedef HCURSOR param_type;
static void Write(Message* m, const param_type& p) {
m->WriteUInt32(reinterpret_cast<uint32>(p));
}
@@ -681,7 +673,6 @@
l->append(StringPrintf("0x%X", p));
}
};
-#endif
template <>
struct ParamTraits<HACCEL> {
« no previous file with comments | « content/renderer/render_view.cc ('k') | printing/printing.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698