Preliminary work to allow Chrome to build with USE_AURA

chrome/common/automation_messages.h

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Multiply-included message file, no traditional include guard.
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
@@ skipping 191 matching lines @@
   ~AttachExternalTabParams();
 
   uint64 cookie;
   GURL url;
   gfx::Rect dimensions;
   int disposition;
   bool user_gesture;
   std::string profile_name;
 };
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 
 struct Reposition_Params {
   HWND window;
   HWND window_insert_after;
   int left;
   int top;
   int width;
   int height;
   int flags;
   bool set_parent;
@@ skipping 57 matching lines @@
 };
 
 template <>
 struct ParamTraits<PageType> {
   typedef PageType param_type;
   static void Write(Message* m, const param_type& p);
   static bool Read(const Message* m, void** iter, param_type* p);
   static void Log(const param_type& p, std::string* l);
 };
 
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
 
 // Traits for SetWindowPos_Params structure to pack/unpack.
 template <>
 struct ParamTraits<Reposition_Params> {
   typedef Reposition_Params param_type;
   static void Write(Message* m, const param_type& p) {
     WriteParam(m, p.window);
     WriteParam(m, p.window_insert_after);
     WriteParam(m, p.left);
     WriteParam(m, p.top);
@@ skipping 100 matching lines @@
   static void Log(const param_type& p, std::string* l);
 };
 
 }  // namespace IPC
 
 #endif  // CHROME_COMMON_AUTOMATION_MESSAGES_H__
 
 // Keep this internal message file unchanged to preserve line numbering
 // (and hence the dubious __LINE__-based message numberings) across versions.
 #include "chrome/common/automation_messages_internal.h"