10 files changed, 17 insertions, 19 deletions
diff --git a/chrome/browser/debugger/devtools_manager.cc b/chrome/browser/debugger/devtools_manager.cc
index e76ca1b..24ba280 100644
--- a/chrome/browser/debugger/devtools_manager.cc
+++ b/chrome/browser/debugger/devtools_manager.cc
@@ -9,9 +9,9 @@
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/tab_contents/web_contents.h"
+#include "chrome/common/devtools_messages.h"
 #include "chrome/common/notification_registrar.h"
 #include "chrome/common/notification_type.h"
-#include "chrome/renderer/devtools_messages.h"
 
 DevToolsManager::DevToolsManager() : web_contents_listeners_(NULL) {
 }
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 615ba24..2c6641e 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -165,6 +165,8 @@
         'common/common_glue.cc',
         'common/debug_flags.cc',
         'common/debug_flags.h',
+        'common/devtools_messages.h',
+        'common/devtools_messages_internal.h',
         'common/drag_drop_types.cc',
         'common/drag_drop_types.h',
         'common/env_vars.cc',
@@ -1410,8 +1412,6 @@
         'renderer/devtools_agent.h',
         'renderer/devtools_client.cc',
         'renderer/devtools_client.h',
-        'renderer/devtools_messages.h',
-        'renderer/devtools_messages_internal.h',
         'renderer/dom_ui_bindings.cc',
         'renderer/dom_ui_bindings.h',
         'renderer/external_host_bindings.cc',
diff --git a/chrome/common/common.vcproj b/chrome/common/common.vcproj
index f392f7d..19dc26a 100644
--- a/chrome/common/common.vcproj
+++ b/chrome/common/common.vcproj
@@ -466,6 +466,14 @@
 			>
 		</File>
 		<File
+			RelativePath=".\devtools_messages.h"
+			>
+		</File>
+		<File
+			RelativePath=".\devtools_messages_internal.h"
+			>
+		</File>
+		<File
 			RelativePath=".\drag_drop_types.cc"
 			>
 		</File>
diff --git a/chrome/renderer/devtools_messages.h b/chrome/common/devtools_messages.h
index 709d51f..3321240e 100644
--- a/chrome/renderer/devtools_messages.h
+++ b/chrome/common/devtools_messages.h
@@ -2,10 +2,10 @@
 // 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_
+#ifndef CHROME_COMMON_DEVTOOLS_MESSAGES_H_
+#define CHROME_COMMON_DEVTOOLS_MESSAGES_H_
 
-#define MESSAGES_INTERNAL_FILE "chrome/renderer/devtools_messages_internal.h"
+#define MESSAGES_INTERNAL_FILE "chrome/common/devtools_messages_internal.h"
 #include "chrome/common/ipc_message_macros.h"
 
-#endif  // CHROME_RENDERER_DEVTOOLS_MESSAGES_H_
+#endif  // CHROME_COMMON_DEVTOOLS_MESSAGES_H_
diff --git a/chrome/renderer/devtools_messages_internal.h b/chrome/common/devtools_messages_internal.h
index b0e0a8a..b0e0a8a 100644
--- a/chrome/renderer/devtools_messages_internal.h
+++ b/chrome/common/devtools_messages_internal.h
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/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>