diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 05:24:07 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 05:24:07 +0000 |
| commit | 4f68ed70ed3e039661b8e492805982e63e80b15b (patch) | |
| tree | c1a183a80140c214f9e4d5cdc6c6bd18cd5e5ffd /content/shell/shell_main_delegate.cc | |
| parent | c3cbe3536b4885fdc2a7ece5863e273a47c42964 (diff) | |
| download | chromium_src-4f68ed70ed3e039661b8e492805982e63e80b15b.zip chromium_src-4f68ed70ed3e039661b8e492805982e63e80b15b.tar.gz chromium_src-4f68ed70ed3e039661b8e492805982e63e80b15b.tar.bz2 | |
Split IPC logging between content and chrome.
I add a new content API to register IPC message loggers, and modify the IPC
message macros to not directly create the g_log_function_mapping. That allows
for multiple files generating IPC loggers. Also, it gets rid of the ctor/dtor
for the g_log_function_mapping.
BUG=101600,111316,155765
Review URL: https://codereview.chromium.org/11347012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/shell_main_delegate.cc')
| -rw-r--r-- | content/shell/shell_main_delegate.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/content/shell/shell_main_delegate.cc b/content/shell/shell_main_delegate.cc index 3a2532d..8baa832 100644 --- a/content/shell/shell_main_delegate.cc +++ b/content/shell/shell_main_delegate.cc @@ -21,6 +21,16 @@ #include "ui/base/ui_base_paths.h" #include "ui/gl/gl_switches.h" +#include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. + +#if defined(IPC_MESSAGE_LOG_ENABLED) +#define IPC_MESSAGE_MACROS_LOG_ENABLED +#include "content/public/common/content_ipc_logging.h" +#define IPC_LOG_TABLE_ADD_ENTRY(msg_id, logger) \ + content::RegisterIPCLogger(msg_id, logger) +#include "content/shell/shell_messages.h" +#endif + #if defined(OS_ANDROID) #include "base/global_descriptors_posix.h" #include "content/shell/android/shell_descriptors.h" |