diff options
| author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 18:02:03 +0000 |
|---|---|---|
| committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-10 18:02:03 +0000 |
| commit | 6edce23f84fe2b88e4dfe8e101b05e60a3646b80 (patch) | |
| tree | 5a7ad67cc6f35469d5abab6090fcbd7424da91ba /chrome/browser/importer | |
| parent | a31c66d79a124782bbaa16870bffbc83bdb639f8 (diff) | |
| download | chromium_src-6edce23f84fe2b88e4dfe8e101b05e60a3646b80.zip chromium_src-6edce23f84fe2b88e4dfe8e101b05e60a3646b80.tar.gz chromium_src-6edce23f84fe2b88e4dfe8e101b05e60a3646b80.tar.bz2 | |
FBTF: Reapplies r55259, the first new IPC definition patch.
This moves MessageWithTuple::Read() back into the main ipc_message_utils.h
header from the private ipc_messsage_utils_impl.h header. In release mode, this
was causing link failures.
BUG=51411
TEST=none
Review URL: http://codereview.chromium.org/3069034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55587 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
| -rw-r--r-- | chrome/browser/importer/firefox_importer_unittest_utils_mac.cc | 7 | ||||
| -rw-r--r-- | chrome/browser/importer/importer_messages.cc | 11 |
2 files changed, 17 insertions, 1 deletions
diff --git a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc index c20940f4..859811e 100644 --- a/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc +++ b/chrome/browser/importer/firefox_importer_unittest_utils_mac.cc @@ -16,11 +16,16 @@ #include "ipc/ipc_switches.h" #include "testing/multiprocess_func_list.h" -// Definition of IPC Messages used for this test. +// Declaration 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 new file mode 100644 index 0000000..d20452a --- /dev/null +++ b/chrome/browser/importer/importer_messages.cc @@ -0,0 +1,11 @@ +// 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" |