Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(187)

Side by Side Diff: base/message_loop/message_loop.cc

Issue 23537016: gtk: Some code cleanup for the message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « base/message_loop/message_loop.h ('k') | base/message_loop/message_pump_aurax11.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/message_loop/message_loop.h" 5 #include "base/message_loop/message_loop.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
418 } 418 }
419 return; 419 return;
420 } 420 }
421 #endif 421 #endif
422 422
423 void MessageLoop::RunInternal() { 423 void MessageLoop::RunInternal() {
424 DCHECK_EQ(this, current()); 424 DCHECK_EQ(this, current());
425 425
426 StartHistogrammer(); 426 StartHistogrammer();
427 427
428 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) 428 #if !defined(OS_MACOSX) && !defined(OS_ANDROID) && \
429 !defined(USE_GTK_MESSAGE_PUMP)
429 if (run_loop_->dispatcher_ && type() == TYPE_UI) { 430 if (run_loop_->dispatcher_ && type() == TYPE_UI) {
430 static_cast<MessagePumpForUI*>(pump_.get())-> 431 static_cast<MessagePumpForUI*>(pump_.get())->
431 RunWithDispatcher(this, run_loop_->dispatcher_); 432 RunWithDispatcher(this, run_loop_->dispatcher_);
432 return; 433 return;
433 } 434 }
434 #endif 435 #endif
435 436
436 pump_->Run(this); 437 pump_->Run(this);
437 } 438 }
438 439
(...skipping 324 matching lines...) Expand 10 before | Expand all | Expand 10 after
763 fd, 764 fd,
764 persistent, 765 persistent,
765 mode, 766 mode,
766 controller, 767 controller,
767 delegate); 768 delegate);
768 } 769 }
769 770
770 #endif 771 #endif
771 772
772 } // namespace base 773 } // namespace base
OLDNEW
« no previous file with comments | « base/message_loop/message_loop.h ('k') | base/message_loop/message_pump_aurax11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698