diff options
| author | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 07:50:53 +0000 |
|---|---|---|
| committer | jar@google.com <jar@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-07-30 07:50:53 +0000 |
| commit | b8f2fe5d397256a8a5d35c9e9b8c84379c5e496e (patch) | |
| tree | 6f692f7c69497506572c3ab4f5a3e73229046dea /chrome | |
| parent | 7622bd0c36e11b0108d3a8dd256211c05ddf5ff5 (diff) | |
| download | chromium_src-b8f2fe5d397256a8a5d35c9e9b8c84379c5e496e.zip chromium_src-b8f2fe5d397256a8a5d35c9e9b8c84379c5e496e.tar.gz chromium_src-b8f2fe5d397256a8a5d35c9e9b8c84379c5e496e.tar.bz2 | |
Rollback 109
M base/message_loop.h
M base/message_loop.cc
M chrome/common/ipc_sync_channel.cc
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/common/ipc_sync_channel.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/chrome/common/ipc_sync_channel.cc b/chrome/common/ipc_sync_channel.cc index 1dc106c..bbd7a23 100644 --- a/chrome/common/ipc_sync_channel.cc +++ b/chrome/common/ipc_sync_channel.cc @@ -445,10 +445,11 @@ bool SyncChannel::Send(IPC::Message* message) { // shutdown the nested loop when there are no more messages. pump_messages_events_.push(pump_messages_event); bool old_state = MessageLoop::current()->NestableTasksAllowed(); + // Insert a Quit message so that we just flush the MessageLoop without + // letting the MessageLoop wait for more messages. + MessageLoop::current()->Quit(); MessageLoop::current()->SetNestableTasksAllowed(true); - // Process a message, but come right back out of the MessageLoop (don't - // loop, sleep, or wait for a kMsgQuit). - MessageLoop::current()->RunOnce(); + MessageLoop::current()->Run(); MessageLoop::current()->SetNestableTasksAllowed(old_state); pump_messages_events_.pop(); } else { |