diff options
Diffstat (limited to 'chrome')
-rw-r--r-- | chrome/browser/importer/firefox_importer_unittest_utils_mac.cc | 7 | ||||
-rw-r--r-- | chrome/browser/importer/importer_messages.cc | 11 | ||||
-rw-r--r-- | chrome/chrome.gyp | 1 | ||||
-rw-r--r-- | chrome/chrome_browser.gypi | 7 | ||||
-rw-r--r-- | chrome/chrome_common.gypi | 10 | ||||
-rw-r--r-- | chrome/common/common_param_traits.h | 3 | ||||
-rw-r--r-- | chrome/common/devtools_messages.cc | 9 | ||||
-rw-r--r-- | chrome/common/gpu_messages.cc | 9 | ||||
-rw-r--r-- | chrome/common/nacl_messages.cc | 9 | ||||
-rw-r--r-- | chrome/common/nacl_messages_internal.h | 1 | ||||
-rw-r--r-- | chrome/common/plugin_messages.cc | 9 | ||||
-rw-r--r-- | chrome/common/render_messages.cc | 12 | ||||
-rw-r--r-- | chrome/common/render_messages_internal.h | 5 | ||||
-rw-r--r-- | chrome/common/service_messages.cc | 9 | ||||
-rw-r--r-- | chrome/common/utility_messages.cc | 9 | ||||
-rw-r--r-- | chrome/common/worker_messages.cc | 9 | ||||
-rw-r--r-- | chrome/test/automation/automation_messages.cc | 9 |
17 files changed, 5 insertions, 124 deletions
diff --git a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc index 859811e..c20940f4 100644 --- a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc +++ b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc @@ -16,16 +16,11 @@ #include "ipc/ipc_switches.h" #include "testing/multiprocess_func_list.h" -// Declaration of IPC Messages used for this test. +// Definition of IPC Messages used for this test. #define MESSAGES_INTERNAL_FILE \ "chrome/browser/importer/firefox_importer_unittest_messages_internal.h" #include "ipc/ipc_message_macros.h" -// Definition of IPC Messages used for this test. -#define MESSAGES_INTERNAL_IMPL_FILE \ - "chrome/browser/importer/firefox_importer_unittest_messages_internal.h" -#include "ipc/ipc_message_impl_macros.h" - namespace { // Name of IPC Channel to use for Server<-> Child Communications. diff --git a/chrome/browser/importer/importer_messages.cc b/chrome/browser/importer/importer_messages.cc deleted file mode 100644 index d20452a..0000000 --- a/chrome/browser/importer/importer_messages.cc +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 2010 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. - -#include "chrome/browser/importer/importer_messages.h" - -#include "base/values.h" - -#define MESSAGES_INTERNAL_IMPL_FILE \ - "chrome/browser/importer/importer_messages_internal.h" -#include "ipc/ipc_message_impl_macros.h" diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 4245b66..a627083 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -1710,7 +1710,6 @@ 'test/automation/automation_constants.h', 'test/automation/automation_handle_tracker.cc', 'test/automation/automation_handle_tracker.h', - 'test/automation/automation_messages.cc', 'test/automation/automation_messages.h', 'test/automation/automation_messages_internal.h', 'test/automation/automation_proxy.cc', diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 5e992cd..a6d6afe 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1825,7 +1825,6 @@ 'browser/importer/importer_data_types.h', 'browser/importer/importer_list.cc', 'browser/importer/importer_list.h', - 'browser/importer/importer_messages.cc', 'browser/importer/importer_messages.h', 'browser/importer/importer_messages_internal.h', 'browser/importer/mork_reader.cc', @@ -2913,12 +2912,6 @@ 'browser/zygote_host_linux.cc', 'browser/zygote_main_linux.cc', - # TODO(erg): http://crbug.com/51409 These files are also specified as - # part of the automation project, but we need these definitions here, - # too, due to usage in our automation provider. - 'test/automation/automation_messages.cc', - 'test/automation/automation_messages.h', - # These files are generated by GRIT. '<(grit_out_dir)/grit/bookmark_manager_resources_map.cc', '<(grit_out_dir)/grit/shared_resources_map.cc', diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index c60359f..05c32be 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -49,7 +49,6 @@ 'common/content_settings_types.h', 'common/debug_flags.cc', 'common/debug_flags.h', - 'common/devtools_messages.cc', 'common/devtools_messages.h', 'common/devtools_messages_internal.h', 'common/font_descriptor_mac.h', @@ -58,7 +57,6 @@ 'common/geoposition.h', 'common/gpu_info.h', 'common/gpu_info.cc', - 'common/gpu_messages.cc', 'common/gpu_messages.h', 'common/gpu_messages_internal.h', 'common/gpu_video_common.cc', @@ -74,10 +72,9 @@ 'common/metrics_helpers.h', 'common/nacl_cmd_line.cc', 'common/nacl_cmd_line.h', - 'common/nacl_messages.cc', 'common/nacl_messages.h', - 'common/nacl_messages_internal.h', 'common/nacl_types.h', + 'common/nacl_messages_internal.h', 'common/notification_details.cc', 'common/notification_details.h', 'common/notification_observer.h', @@ -251,10 +248,8 @@ 'common/pepper_plugin_registry.h', 'common/plugin_carbon_interpose_constants_mac.h', 'common/plugin_carbon_interpose_constants_mac.cc', - 'common/plugin_messages.cc', 'common/plugin_messages.h', 'common/plugin_messages_internal.h', - 'common/render_messages.cc', 'common/render_messages.h', 'common/render_messages_internal.h', 'common/renderer_preferences.h', @@ -262,7 +257,6 @@ 'common/resource_dispatcher.h', 'common/security_filter_peer.cc', 'common/security_filter_peer.h', - 'common/service_messages.cc', 'common/service_messages.h', 'common/services_messages_internal.h', 'common/socket_stream_dispatcher.cc', @@ -277,7 +271,6 @@ 'common/thumbnail_score.h', 'common/url_constants.cc', 'common/url_constants.h', - 'common/utility_messages.cc', 'common/utility_messages.h', 'common/utility_messages_internal.h', 'common/view_types.cc', @@ -291,7 +284,6 @@ 'common/webmessageportchannel_impl.h', 'common/window_container_type.cc', 'common/window_container_type.h', - 'common/worker_messages.cc', 'common/worker_messages.h', 'common/worker_messages_internal.h', 'common/worker_thread_ticker.cc', diff --git a/chrome/common/common_param_traits.h b/chrome/common/common_param_traits.h index f39c066..0ca6bed 100644 --- a/chrome/common/common_param_traits.h +++ b/chrome/common/common_param_traits.h @@ -34,7 +34,6 @@ class DictionaryValue; class ListValue; struct ThumbnailScore; class URLRequestStatus; -class WebCursor; namespace gfx { class Point; @@ -211,7 +210,7 @@ struct ParamTraits<WebCursor> { static void Write(Message* m, const param_type& p) { p.Serialize(m); } - static bool Read(const Message* m, void** iter, param_type* r) { + static bool Read(const Message* m, void** iter, param_type* r) { return r->Deserialize(m, iter); } static void Log(const param_type& p, std::wstring* l) { diff --git a/chrome/common/devtools_messages.cc b/chrome/common/devtools_messages.cc deleted file mode 100644 index 8ea923e..0000000 --- a/chrome/common/devtools_messages.cc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2010 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. - -#include "chrome/common/devtools_messages.h" - -#define MESSAGES_INTERNAL_IMPL_FILE \ - "chrome/common/devtools_messages_internal.h" -#include "ipc/ipc_message_impl_macros.h" diff --git a/chrome/common/gpu_messages.cc b/chrome/common/gpu_messages.cc deleted file mode 100644 index 4ba5776..0000000 --- a/chrome/common/gpu_messages.cc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2010 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. - -#include "chrome/common/gpu_messages.h" - -#define MESSAGES_INTERNAL_IMPL_FILE \ - "chrome/common/gpu_messages_internal.h" -#include "ipc/ipc_message_impl_macros.h" diff --git a/chrome/common/nacl_messages.cc b/chrome/common/nacl_messages.cc deleted file mode 100644 index 291ed5a..0000000 --- a/chrome/common/nacl_messages.cc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2010 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. - -#include "chrome/common/nacl_messages.h" - -#define MESSAGES_INTERNAL_IMPL_FILE \ - "chrome/common/nacl_messages_internal.h" -#include "ipc/ipc_message_impl_macros.h" diff --git a/chrome/common/nacl_messages_internal.h b/chrome/common/nacl_messages_internal.h index e302118..8d95cc7 100644 --- a/chrome/common/nacl_messages_internal.h +++ b/chrome/common/nacl_messages_internal.h @@ -2,7 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/process.h" #include "chrome/common/nacl_types.h" #include "ipc/ipc_message_macros.h" diff --git a/chrome/common/plugin_messages.cc b/chrome/common/plugin_messages.cc deleted file mode 100644 index 598de69..0000000 --- a/chrome/common/plugin_messages.cc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2010 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. - -#include "chrome/common/plugin_messages.h" - -#define MESSAGES_INTERNAL_IMPL_FILE \ - "chrome/common/plugin_messages_internal.h" -#include "ipc/ipc_message_impl_macros.h" diff --git a/chrome/common/render_messages.cc b/chrome/common/render_messages.cc deleted file mode 100644 index 68aa81d..0000000 --- a/chrome/common/render_messages.cc +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2010 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. - -#include "chrome/common/render_messages.h" - -#include "chrome/common/thumbnail_score.h" -#include "webkit/glue/webcursor.h" - -#define MESSAGES_INTERNAL_IMPL_FILE \ - "chrome/common/render_messages_internal.h" -#include "ipc/ipc_message_impl_macros.h" diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index 95389c4..a9efdc8 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -24,6 +24,7 @@ #include "chrome/common/nacl_types.h" #include "chrome/common/notification_type.h" #include "chrome/common/page_zoom.h" +#include "chrome/common/thumbnail_score.h" #include "chrome/common/translate_errors.h" #include "chrome/common/window_container_type.h" #include "gfx/rect.h" @@ -33,6 +34,7 @@ #include "third_party/skia/include/core/SkBitmap.h" #include "webkit/glue/dom_operations.h" #include "webkit/glue/form_field.h" +#include "webkit/glue/webcursor.h" #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" @@ -50,9 +52,6 @@ // Substitution map for l10n messages. typedef std::map<std::string, std::string> SubstitutionMap; -struct ThumbnailScore; -class WebCursor; - //----------------------------------------------------------------------------- // RenderView messages // These are messages sent from the browser to the renderer process. diff --git a/chrome/common/service_messages.cc b/chrome/common/service_messages.cc deleted file mode 100644 index 97a10fd..0000000 --- a/chrome/common/service_messages.cc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2010 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. - -#include "chrome/common/service_messages.h" - -#define MESSAGES_INTERNAL_IMPL_FILE \ - "chrome/common/service_messages_internal.h" -#include "ipc/ipc_message_impl_macros.h" diff --git a/chrome/common/utility_messages.cc b/chrome/common/utility_messages.cc deleted file mode 100644 index 4c8e567..0000000 --- a/chrome/common/utility_messages.cc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2010 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. - -#include "chrome/common/utility_messages.h" - -#define MESSAGES_INTERNAL_IMPL_FILE \ - "chrome/common/utility_messages_internal.h" -#include "ipc/ipc_message_impl_macros.h" diff --git a/chrome/common/worker_messages.cc b/chrome/common/worker_messages.cc deleted file mode 100644 index 437e030..0000000 --- a/chrome/common/worker_messages.cc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2010 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. - -#include "chrome/common/worker_messages.h" - -#define MESSAGES_INTERNAL_IMPL_FILE \ - "chrome/common/worker_messages_internal.h" -#include "ipc/ipc_message_impl_macros.h" diff --git a/chrome/test/automation/automation_messages.cc b/chrome/test/automation/automation_messages.cc deleted file mode 100644 index 8c26327..0000000 --- a/chrome/test/automation/automation_messages.cc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2010 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. - -#include "chrome/test/automation/automation_messages.h" - -#define MESSAGES_INTERNAL_IMPL_FILE \ - "chrome/test/automation/automation_messages_internal.h" -#include "ipc/ipc_message_impl_macros.h" |