DevTools: move devtools messages to common.

Review URL: http://codereview.chromium.org/60087

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@13079 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 2 insertions, 108 deletions

diff --git a/chrome/renderer/devtools_agent.cc b/chrome/renderer/devtools_agent.cc
index 2fe4ef6..e46217f 100644
--- a/chrome/renderer/devtools_agent.cc
+++ b/chrome/renderer/devtools_agent.cc
@@ -16,8 +16,8 @@
 #include "chrome/renderer/devtools_agent.h"
 
 #include "base/message_loop.h"
+#include "chrome/common/devtools_messages.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/devtools_messages.h"
 // TODO(yurys): remove this macros once plugins available on other platforms
 #if defined(OS_WIN)
 #include "chrome/renderer/plugin_channel_host.h"
diff --git a/chrome/renderer/devtools_agent.h b/chrome/renderer/devtools_agent.h
index 9059542..29352a0 100644
--- a/chrome/renderer/devtools_agent.h
+++ b/chrome/renderer/devtools_agent.h
@@ -11,7 +11,6 @@
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/ipc_channel_proxy.h"
-#include "chrome/renderer/devtools_messages.h"
 #include "webkit/glue/webdevtoolsagent_delegate.h"
 
 class MessageLoop;
diff --git a/chrome/renderer/devtools_client.cc b/chrome/renderer/devtools_client.cc
index a8a9fbb..852b9988 100644
--- a/chrome/renderer/devtools_client.cc
+++ b/chrome/renderer/devtools_client.cc
@@ -4,8 +4,8 @@
 
 #include "chrome/renderer/devtools_client.h"
 
+#include "chrome/common/devtools_messages.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/renderer/devtools_messages.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "webkit/glue/webdevtoolsclient.h"
diff --git a/chrome/renderer/devtools_client.h b/chrome/renderer/devtools_client.h
index 2a6bb9e..cbd687b 100644
--- a/chrome/renderer/devtools_client.h
+++ b/chrome/renderer/devtools_client.h
@@ -8,7 +8,6 @@
 #include <string>
 
 #include "base/scoped_ptr.h"
-#include "chrome/renderer/devtools_messages.h"
 #include "webkit/glue/webdevtoolsclient_delegate.h"
 
 namespace IPC {
diff --git a/chrome/renderer/devtools_messages.h b/chrome/renderer/devtools_messages.h
deleted file mode 100644
index 709d51f..0000000
--- a/chrome/renderer/devtools_messages.h
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright (c) 2009 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.
-
-#ifndef CHROME_RENDERER_DEVTOOLS_MESSAGES_H_
-#define CHROME_RENDERER_DEVTOOLS_MESSAGES_H_
-
-#define MESSAGES_INTERNAL_FILE "chrome/renderer/devtools_messages_internal.h"
-#include "chrome/common/ipc_message_macros.h"
-
-#endif  // CHROME_RENDERER_DEVTOOLS_MESSAGES_H_
diff --git a/chrome/renderer/devtools_messages_internal.h b/chrome/renderer/devtools_messages_internal.h
deleted file mode 100644
index b0e0a8a..0000000
--- a/chrome/renderer/devtools_messages_internal.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) 2009 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.
-
-// This header is meant to be included in multiple passes, hence no traditional
-// header guard.
-// See ipc_message_macros.h for explanation of the macros and passes.
-
-// Developer tools consist of the following parts:
-//
-// DevToolsAgent lives in the renderer of an inspected page and provides access
-// to the pages resources, DOM, v8 etc. by means of IPC messages.
-//
-// DevToolsClient is a thin delegate that lives in the tools front-end
-// renderer and converts IPC messages to frontend method calls and allows the
-// frontend to send messages to the DevToolsAgent.
-//
-// All the messages are routed through browser process. There is a
-// DevToolsManager living in the browser process that is responsible for
-// routing logistics. It is also capable of sending direct messages to the
-// agent rather than forwarding messages between agents and clients only.
-//
-// Chain of communication between the components may be described by the
-// following diagram:
-//  ----------------------------
-// | (tools frontend            |
-// | renderer process)          |
-// |                            |            --------------------
-// |tools    <--> DevToolsClient+<-- IPC -->+ (browser process)  |
-// |frontend                    |           |                    |
-//  ----------------------------             ---------+----------
-//                                                    ^
-//                                                    |
-//                                                   IPC
-//                                                    |
-//                                                    v
-//                          --------------------------+--------
-//                         | inspected page <--> DevToolsAgent |
-//                         |                                   |
-//                         | (inspected page renderer process) |
-//                          -----------------------------------
-//
-// This file describes developer tools message types.
-
-#include "chrome/common/ipc_message_macros.h"
-
-// These are messages sent from DevToolsAgent to DevToolsClient through the
-// browser.
-IPC_BEGIN_MESSAGES(DevToolsClient)
-
-  // Sends glue-level Rpc message to the client.
-  IPC_MESSAGE_CONTROL1(DevToolsClientMsg_RpcMessage,
-                       std::string  /* raw_msg */)
-
-IPC_END_MESSAGES(DevToolsClient)
-
-
-//-----------------------------------------------------------------------------
-// These are messages sent from DevToolsClient to DevToolsAgent through the
-// browser.
-IPC_BEGIN_MESSAGES(DevToolsAgent)
-
-  // Tells agent that there is a client host connected to it.
-  IPC_MESSAGE_CONTROL0(DevToolsAgentMsg_Attach)
-
-  // Tells agent that there is no longer a client host connected to it.
-  IPC_MESSAGE_CONTROL0(DevToolsAgentMsg_Detach)
-
-  // Sends glue-level Rpc message to the agent.
-  IPC_MESSAGE_CONTROL1(DevToolsAgentMsg_RpcMessage,
-                       std::string  /* raw_msg */)
-
-  // Send debugger command to the debugger agent. Debugger commands should
-  // be handled on IO thread(while all other devtools messages are handled in
-  // the render thread) to allow executing the commands when v8 is on a
-  // breakpoint.
-  IPC_MESSAGE_CONTROL1(DevToolsAgentMsg_DebuggerCommand,
-                       std::string  /* command */)
-
-  // Inspect element with the given coordinates.
-  IPC_MESSAGE_CONTROL2(DevToolsAgentMsg_InspectElement,
-                       int /* x */,
-                       int /* y */)
-
-IPC_END_MESSAGES(DevToolsAgent)
diff --git a/chrome/renderer/renderer.vcproj b/chrome/renderer/renderer.vcproj
index 38df719..3a70134 100644
--- a/chrome/renderer/renderer.vcproj
+++ b/chrome/renderer/renderer.vcproj
@@ -234,14 +234,6 @@
 			>
 		</File>
 		<File
-			RelativePath=".\devtools_messages.h"
-			>
-		</File>
-		<File
-			RelativePath=".\devtools_messages_internal.h"
-			>
-		</File>
-		<File
 			RelativePath=".\dom_ui_bindings.cc"
 			>
 		</File>