Index: base/message_loop/message_pump_win.cc |
diff --git a/base/message_loop/message_pump_win.cc b/base/message_loop/message_pump_win.cc |
index 1927473b1eb46b0fbc9e8bf726b39a907d7a7578..d570130ecd39000eca8af594b193ecd0f299ba58 100644 |
--- a/base/message_loop/message_pump_win.cc |
+++ b/base/message_loop/message_pump_win.cc |
@@ -97,8 +97,7 @@ int MessagePumpWin::GetCurrentDelay() const { |
// MessagePumpForUI public: |
MessagePumpForUI::MessagePumpForUI() |
- : atom_(0), |
- message_filter_(new MessageFilter) { |
+ : atom_(0) { |
InitMessageWnd(); |
} |
@@ -346,7 +345,7 @@ bool MessagePumpForUI::ProcessNextWindowsMessage() { |
sent_messages_in_queue = true; |
MSG msg; |
- if (message_filter_->DoPeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) |
+ if (!!PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) |
Nico
2014/02/08 20:10:46
Do you need the `!!`? Is just `if (PeekMessage(…`
yukawa
2014/02/09 08:09:08
Year, that is not necessary in C but I believe it
Nico
2014/02/09 20:36:09
I think we build with C4800 enabled. I think `!= 0
yukawa
2014/02/10 06:50:46
OK. Switched to ` != FALSE`.
|
return ProcessMessageHelper(msg); |
return sent_messages_in_queue; |
@@ -372,14 +371,12 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) { |
WillProcessMessage(msg); |
- if (!message_filter_->ProcessMessage(msg)) { |
- if (state_->dispatcher) { |
- if (!state_->dispatcher->Dispatch(msg)) |
- state_->should_quit = true; |
- } else { |
- TranslateMessage(&msg); |
- DispatchMessage(&msg); |
- } |
+ if (state_->dispatcher) { |
+ if (!state_->dispatcher->Dispatch(msg)) |
+ state_->should_quit = true; |
+ } else { |
+ TranslateMessage(&msg); |
+ DispatchMessage(&msg); |
} |
DidProcessMessage(msg); |
@@ -406,8 +403,7 @@ bool MessagePumpForUI::ProcessPumpReplacementMessage() { |
have_message = PeekMessage(&msg, NULL, WM_PAINT, WM_PAINT, PM_REMOVE) || |
PeekMessage(&msg, NULL, WM_TIMER, WM_TIMER, PM_REMOVE); |
} else { |
- have_message = !!message_filter_->DoPeekMessage(&msg, NULL, 0, 0, |
- PM_REMOVE); |
+ have_message = !!PeekMessage(&msg, NULL, 0, 0, PM_REMOVE); |
} |
DCHECK(!have_message || kMsgHaveWork != msg.message || |
@@ -429,11 +425,6 @@ bool MessagePumpForUI::ProcessPumpReplacementMessage() { |
return ProcessMessageHelper(msg); |
} |
-void MessagePumpForUI::SetMessageFilter( |
- scoped_ptr<MessageFilter> message_filter) { |
- message_filter_ = message_filter.Pass(); |
-} |
- |
//----------------------------------------------------------------------------- |
// MessagePumpForIO public: |