diff options
author | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 21:07:27 +0000 |
---|---|---|
committer | maruel@google.com <maruel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-05 21:07:27 +0000 |
commit | d3216441b7726c31fb0ae9b9d90b64421e14ca39 (patch) | |
tree | 653882df34541ec7aa37e4024f8fce27fd9ba5b6 /chrome/common | |
parent | ba61ace67a08e56026d2e8034d7a938d2f8e5bd6 (diff) | |
download | chromium_src-d3216441b7726c31fb0ae9b9d90b64421e14ca39.zip chromium_src-d3216441b7726c31fb0ae9b9d90b64421e14ca39.tar.gz chromium_src-d3216441b7726c31fb0ae9b9d90b64421e14ca39.tar.bz2 |
NO CODE CHANGE.
Split the lines >80 cols. (Part 1)
Review URL: http://codereview.chromium.org/39206
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11032 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/common')
-rw-r--r-- | chrome/common/child_process_host.cc | 3 | ||||
-rw-r--r-- | chrome/common/child_thread.cc | 3 | ||||
-rw-r--r-- | chrome/common/chrome_paths.cc | 3 | ||||
-rw-r--r-- | chrome/common/chrome_plugin_api.h | 9 | ||||
-rw-r--r-- | chrome/common/classfactory.cc | 3 | ||||
-rw-r--r-- | chrome/common/classfactory.h | 6 | ||||
-rw-r--r-- | chrome/common/ipc_channel_win.cc | 4 | ||||
-rw-r--r-- | chrome/common/ipc_message_macros.h | 11 | ||||
-rw-r--r-- | chrome/common/ipc_sync_channel.cc | 3 | ||||
-rw-r--r-- | chrome/common/ipc_sync_channel.h | 12 | ||||
-rw-r--r-- | chrome/common/ipc_sync_message.cc | 3 | ||||
-rw-r--r-- | chrome/common/ipc_sync_message_unittest.cc | 3 | ||||
-rw-r--r-- | chrome/common/ipc_sync_message_unittest.h | 18 |
13 files changed, 50 insertions, 31 deletions
diff --git a/chrome/common/child_process_host.cc b/chrome/common/child_process_host.cc index 39e7661..7839f44 100644 --- a/chrome/common/child_process_host.cc +++ b/chrome/common/child_process_host.cc @@ -119,7 +119,8 @@ ChildProcessHost::ListenerHook::ListenerHook(ChildProcessHost* host) : host_(host) { } -void ChildProcessHost::ListenerHook::OnMessageReceived(const IPC::Message& msg) { +void ChildProcessHost::ListenerHook::OnMessageReceived( + const IPC::Message& msg) { #ifdef IPC_MESSAGE_LOG_ENABLED IPC::Logging* logger = IPC::Logging::current(); if (msg.type() == IPC_LOGGING_ID) { diff --git a/chrome/common/child_thread.cc b/chrome/common/child_thread.cc index ff73a7f..7a6e39c 100644 --- a/chrome/common/child_thread.cc +++ b/chrome/common/child_thread.cc @@ -24,7 +24,8 @@ ChildThread::ChildThread(Thread::Options options) if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kUserAgent)) { webkit_glue::SetUserAgent(WideToUTF8( - CommandLine::ForCurrentProcess()->GetSwitchValue(switches::kUserAgent))); + CommandLine::ForCurrentProcess()->GetSwitchValue( + switches::kUserAgent))); } } diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc index 9b3f8ce..22ab129 100644 --- a/chrome/common/chrome_paths.cc +++ b/chrome/common/chrome_paths.cc @@ -213,7 +213,8 @@ bool PathProvider(int key, FilePath* result) { return false; } - if (create_dir && !file_util::PathExists(cur) && !file_util::CreateDirectory(cur)) + if (create_dir && !file_util::PathExists(cur) && + !file_util::CreateDirectory(cur)) return false; *result = cur; diff --git a/chrome/common/chrome_plugin_api.h b/chrome/common/chrome_plugin_api.h index 039dac8..4eae375 100644 --- a/chrome/common/chrome_plugin_api.h +++ b/chrome/common/chrome_plugin_api.h @@ -218,9 +218,9 @@ typedef void (STDCALL *CPB_SetKeepProcessAliveFunc)(CPID id, // Asks the browser to show an HTML dialog to the user. The dialog contents // should be loaded from the given URL. The 'json_arguments' is a JSON string // that the dialog can fetch using Chrome's JavaScript DOM bindings. This call -// will block until the dialog is closed. On success, 'json_retval' will contain -// the JSON string sent back by the dialog (using Chrome's JavaScript DOM -// bindings), and CPERR_SUCCESS is returned. 'json_retval' should be freed +// will block until the dialog is closed. On success, 'json_retval' will +// contain the JSON string sent back by the dialog (using Chrome's JavaScript +// DOM bindings), and CPERR_SUCCESS is returned. 'json_retval' should be freed // using CPB_Free when done. typedef CPError (STDCALL *CPB_ShowHtmlDialogModalFunc)( CPID id, CPBrowsingContext context, const char* url, int width, int height, @@ -405,7 +405,8 @@ typedef void (STDCALL *CPP_OnMessageFunc)(void *data, uint32 data_len); // Informs the plugin of raw data having been sent from another process. typedef void (STDCALL *CPP_OnSyncMessageFunc)(void *data, uint32 data_len, - void **retval, uint32 *retval_len); + void **retval, + uint32 *retval_len); // Informs the plugin that the file dialog has completed, and contains the // results. diff --git a/chrome/common/classfactory.cc b/chrome/common/classfactory.cc index feaa9e6..ba32c15 100644 --- a/chrome/common/classfactory.cc +++ b/chrome/common/classfactory.cc @@ -21,7 +21,8 @@ GenericClassFactory::~GenericClassFactory() { LONG GenericClassFactory::object_count_ = 0; -STDMETHODIMP GenericClassFactory::QueryInterface(REFIID riid, LPVOID* ppobject) { +STDMETHODIMP GenericClassFactory::QueryInterface(REFIID riid, + LPVOID* ppobject) { *ppobject = NULL; if (IsEqualIID(riid, IID_IUnknown) || diff --git a/chrome/common/classfactory.h b/chrome/common/classfactory.h index bd42cb8..291ce00 100644 --- a/chrome/common/classfactory.h +++ b/chrome/common/classfactory.h @@ -25,7 +25,8 @@ public: STDMETHOD_(ULONG, Release)(); //IClassFactory methods - STDMETHOD(CreateInstance)(LPUNKNOWN pUnkOuter, REFIID riid, LPVOID* ppvObject) = 0; + STDMETHOD(CreateInstance)(LPUNKNOWN pUnkOuter, REFIID riid, + LPVOID* ppvObject) = 0; STDMETHOD(LockServer)(BOOL fLock); // generally handy for DllUnloadNow -- count of existing descendant objects @@ -49,7 +50,8 @@ public: template <class T> -STDMETHODIMP OneClassFactory<T>::CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void** result) { +STDMETHODIMP OneClassFactory<T>::CreateInstance(LPUNKNOWN pUnkOuter, + REFIID riid, void** result) { *result = NULL; if(pUnkOuter != NULL) diff --git a/chrome/common/ipc_channel_win.cc b/chrome/common/ipc_channel_win.cc index 54818b5..38e442a 100644 --- a/chrome/common/ipc_channel_win.cc +++ b/chrome/common/ipc_channel_win.cc @@ -106,8 +106,8 @@ bool Channel::ChannelImpl::Send(Message* message) { return true; } -const std::wstring Channel::ChannelImpl::PipeName(const std::wstring& channel_id) - const { +const std::wstring Channel::ChannelImpl::PipeName( + const std::wstring& channel_id) const { std::wostringstream ss; // XXX(darin): get application name from somewhere else ss << L"\\\\.\\pipe\\chrome." << channel_id; diff --git a/chrome/common/ipc_message_macros.h b/chrome/common/ipc_message_macros.h index 18b6e9f..8947e8e 100644 --- a/chrome/common/ipc_message_macros.h +++ b/chrome/common/ipc_message_macros.h @@ -18,8 +18,8 @@ // "Sync" messages are just synchronous calls, the Send() call doesn't return // until a reply comes back. Input parameters are first (const TYPE&), and // To declare a sync message, use the IPC_SYNC_ macros. The numbers at the -// end show how many input/output parameters there are (i.e. 1_2 is 1 in, 2 out). -// The caller does a Send([route id, ], in1, &out1, &out2). +// end show how many input/output parameters there are (i.e. 1_2 is 1 in, 2 +// out). The caller does a Send([route id, ], in1, &out1, &out2). // The receiver's handler function will be // void OnSyncMessageName(const type1& in1, type2* out1, type3* out2) // @@ -30,7 +30,8 @@ // type, stash the message, and when it has the data it can Send the message. // // Use the IPC_MESSAGE_HANDLER_DELAY_REPLY macro instead of IPC_MESSAGE_HANDLER -// IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_SyncMessageName, OnSyncMessageName) +// IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_SyncMessageName, +// OnSyncMessageName) // // The handler function will look like: // void OnSyncMessageName(const type1& in1, IPC::Message* reply_msg); @@ -140,11 +141,11 @@ // 16 channel types (currently using 8) and 4K messages per type. Should // really make type be 32 bits, but then we break automation with older Chrome // builds.. - +// Do label##PreStart so that automation messages keep the same id as before. #define IPC_BEGIN_MESSAGES(label) \ enum label##MsgType { \ label##Start = label##MsgStart << 12, \ - label##PreStart = (label##MsgStart << 12) - 1, // Do this so that automation messages keep the same id as before + label##PreStart = (label##MsgStart << 12) - 1, #define IPC_END_MESSAGES(label) \ label##End \ diff --git a/chrome/common/ipc_sync_channel.cc b/chrome/common/ipc_sync_channel.cc index 4abef3a4..307c1e6 100644 --- a/chrome/common/ipc_sync_channel.cc +++ b/chrome/common/ipc_sync_channel.cc @@ -388,7 +388,8 @@ bool SyncChannel::SendWithTimeout(Message* message, int timeout_ms) { return false; } - DCHECK(sync_messages_with_no_timeout_allowed_ || timeout_ms != base::kNoTimeout); + DCHECK(sync_messages_with_no_timeout_allowed_ || + timeout_ms != base::kNoTimeout); SyncMessage* sync_msg = static_cast<SyncMessage*>(message); context->Push(sync_msg); int message_id = SyncMessage::GetMessageId(*sync_msg); diff --git a/chrome/common/ipc_sync_channel.h b/chrome/common/ipc_sync_channel.h index 725fb33..6c3ce54 100644 --- a/chrome/common/ipc_sync_channel.h +++ b/chrome/common/ipc_sync_channel.h @@ -79,8 +79,8 @@ class SyncChannel : public ChannelProxy, void DispatchMessages(); // Checks if the given message is blocking the listener thread because of a - // synchronous send. If it is, the thread is unblocked and true is returned. - // Otherwise the function returns false. + // synchronous send. If it is, the thread is unblocked and true is + // returned. Otherwise the function returns false. bool TryToUnblockListener(const Message* msg); // Called on the IPC thread when a sync send that runs a nested message loop @@ -107,8 +107,8 @@ class SyncChannel : public ChannelProxy, // WaitableEventWatcher::Delegate implementation. virtual void OnWaitableEventSignaled(base::WaitableEvent* arg); - // When sending a synchronous message, this structure contains an object that - // knows how to deserialize the response. + // When sending a synchronous message, this structure contains an object + // that knows how to deserialize the response. struct PendingSyncMsg { PendingSyncMsg(int id, IPC::MessageReplyDeserializer* d, base::WaitableEvent* e) : @@ -133,7 +133,9 @@ class SyncChannel : public ChannelProxy, // WaitableEventWatcher::Delegate implementation. virtual void OnWaitableEventSignaled(base::WaitableEvent* arg); - SyncContext* sync_context() { return reinterpret_cast<SyncContext*>(context()); } + SyncContext* sync_context() { + return reinterpret_cast<SyncContext*>(context()); + } // Both these functions wait for a reply, timeout or process shutdown. The // latter one also runs a nested message loop in the meantime. diff --git a/chrome/common/ipc_sync_message.cc b/chrome/common/ipc_sync_message.cc index e895db9..9ed2679 100644 --- a/chrome/common/ipc_sync_message.cc +++ b/chrome/common/ipc_sync_message.cc @@ -77,7 +77,8 @@ int SyncMessage::GetMessageId(const Message& msg) { Message* SyncMessage::GenerateReply(const Message* msg) { DCHECK(msg->is_sync()); - Message* reply = new Message(msg->routing_id(), IPC_REPLY_ID, msg->priority()); + Message* reply = new Message(msg->routing_id(), IPC_REPLY_ID, + msg->priority()); reply->set_reply(); SyncHeader header; diff --git a/chrome/common/ipc_sync_message_unittest.cc b/chrome/common/ipc_sync_message_unittest.cc index 6508eaf..dc6dd4a 100644 --- a/chrome/common/ipc_sync_message_unittest.cc +++ b/chrome/common/ipc_sync_message_unittest.cc @@ -85,7 +85,8 @@ class TestMessageReceiver { *out2 = 32; } - void On_3_3(int in1, std::string in2, bool in3, std::string* out1, int* out2, bool* out3) { + void On_3_3(int in1, std::string in2, bool in3, std::string* out1, int* out2, + bool* out3) { DCHECK(in1 == 3 && in2 == "3_3" && in3); *out1 = "3_3"; *out2 = 33; diff --git a/chrome/common/ipc_sync_message_unittest.h b/chrome/common/ipc_sync_message_unittest.h index 3b32c10..409e458 100644 --- a/chrome/common/ipc_sync_message_unittest.h +++ b/chrome/common/ipc_sync_message_unittest.h @@ -44,11 +44,14 @@ IPC_BEGIN_MESSAGES(Test) // in1 must be 1, in2 must be false, in3 must be "3_1", out1 is true IPC_SYNC_MESSAGE_CONTROL3_1(Msg_C_3_1, int, bool, std::string, bool) - // in1 must be "3_3", in2 must be false, in3 must be 2, out1 is true, out2 is 32 + // in1 must be "3_3", in2 must be false, in3 must be 2, out1 is true, out2 is + // 32 IPC_SYNC_MESSAGE_CONTROL3_2(Msg_C_3_2, std::string, bool, int, bool, int) - // in1 must be 3, in2 must be "3_3", in3 must be true, out1 is "3_3", out2 is 33, out3 is false - IPC_SYNC_MESSAGE_CONTROL3_3(Msg_C_3_3, int, std::string, bool, std::string, int, bool) + // in1 must be 3, in2 must be "3_3", in3 must be true, out1 is "3_3", out2 is + // 33, out3 is false + IPC_SYNC_MESSAGE_CONTROL3_3(Msg_C_3_3, int, std::string, bool, std::string, + int, bool) // NOTE: routed messages are just a copy of the above... @@ -83,11 +86,14 @@ IPC_BEGIN_MESSAGES(Test) // in1 must be 1, in2 must be false, in3 must be "3_1", out1 is true IPC_SYNC_MESSAGE_ROUTED3_1(Msg_R_3_1, int, bool, std::string, bool) - // in1 must be "3_3", in2 must be false, in3 must be 2, out1 is true, out2 is 32 + // in1 must be "3_3", in2 must be false, in3 must be 2, out1 is true, out2 + // is 32 IPC_SYNC_MESSAGE_ROUTED3_2(Msg_R_3_2, std::string, bool, int, bool, int) - // in1 must be 3, in2 must be "3_3", in3 must be true, out1 is "3_3", out2 is 33, out3 is false - IPC_SYNC_MESSAGE_ROUTED3_3(Msg_R_3_3, int, std::string, bool, std::string, int, bool) + // in1 must be 3, in2 must be "3_3", in3 must be true, out1 is "3_3", out2 is + // 33, out3 is false + IPC_SYNC_MESSAGE_ROUTED3_3(Msg_R_3_3, int, std::string, bool, std::string, + int, bool) IPC_END_MESSAGES(TestMsg) |