diff options
| -rw-r--r-- | chrome/common/all_messages.h | 6 | ||||
| -rw-r--r-- | chrome/tools/ipclist/ipclist.cc | 15 | ||||
| -rw-r--r-- | ipc/ipc_channel_proxy.cc | 15 |
3 files changed, 8 insertions, 28 deletions
diff --git a/chrome/common/all_messages.h b/chrome/common/all_messages.h index 1641525..7eec49d 100644 --- a/chrome/common/all_messages.h +++ b/chrome/common/all_messages.h @@ -1,13 +1,11 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. // Multiply-included file, hence no include guard. -// Inclusion of all message files present in chrome. Keep this file +// Inclusion of all message files present in the system. Keep this file // up-to-date when adding a new value to enum IPCMessageStart in // ipc/ipc_message_utils.h to include the corresponding message file. -// Messages classes used exclusively outside of chrome should instead get an -// exemption in chrome/tools/ipclist/ipclist.cc. #include "chrome/browser/importer/profile_import_process_messages.h" // We can't make common_message_generator.h include automation_messages, since // otherwise the Chrome Frame binaries will link in a lot of unrelated chrome diff --git a/chrome/tools/ipclist/ipclist.cc b/chrome/tools/ipclist/ipclist.cc index a2d37a8..9a2faab 100644 --- a/chrome/tools/ipclist/ipclist.cc +++ b/chrome/tools/ipclist/ipclist.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -38,11 +38,10 @@ static bool check_msgtable() { int highest_class_id = 0; std::vector<int> exemptions; - // Exclude test and other non-browser files from consideration. Do not - // include message files used inside the actual chrome browser in this list. + // Exclude test files from consideration. Do not include message + // files used inside the actual chrome browser in this list. exemptions.push_back(TestMsgStart); exemptions.push_back(FirefoxImporterUnittestMsgStart); - exemptions.push_back(ShellMsgStart); for (size_t i = 0; i < MSGTABLE_SIZE; ++i) { int class_id = IPC_MESSAGE_ID_CLASS(msgtable[i].id); @@ -65,15 +64,9 @@ static bool check_msgtable() { highest_class_id = class_id; } - while (LastIPCMsgStart > highest_class_id + 1) { - std::vector<int>::iterator iter; - iter = find(exemptions.begin(), exemptions.end(), highest_class_id+1); - if (iter == exemptions.end()) { + if (LastIPCMsgStart > highest_class_id + 1) { std::cout << "Missing message file: gap before LastIPCMsgStart\n"; result = false; - break; - } - ++highest_class_id; } if (!result) diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc index 0c26267..f542eae 100644 --- a/ipc/ipc_channel_proxy.cc +++ b/ipc/ipc_channel_proxy.cc @@ -1,10 +1,9 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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 "base/bind.h" #include "base/compiler_specific.h" -#include "base/debug/trace_event.h" #include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" @@ -239,23 +238,13 @@ void ChannelProxy::Context::AddFilter(MessageFilter* filter) { // Called on the listener's thread void ChannelProxy::Context::OnDispatchMessage(const Message& message) { -#ifdef IPC_MESSAGE_LOG_ENABLED - Logging* logger = Logging::GetInstance(); - std::string name; - logger->GetMessageText(message.type(), &name, &message, NULL); - TRACE_EVENT1("task", "ChannelProxy::Context::OnDispatchMessage", - "name", name); -#else - TRACE_EVENT1("task", "ChannelProxy::Context::OnDispatchMessage", - "type", message.type()); -#endif - if (!listener_) return; OnDispatchConnected(); #ifdef IPC_MESSAGE_LOG_ENABLED + Logging* logger = Logging::GetInstance(); if (message.type() == IPC_LOGGING_ID) { logger->OnReceivedLoggingMessage(message); return; |