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

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

Issue 219743002: x11: Move X event handling out of the message-pump. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: tot-merge-r261267 Created 6 years, 8 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 | « ash/ash.gyp ('k') | base/message_loop/message_pump_x11.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 370 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 new internal::MessageLoopProxyImpl(incoming_task_queue_); 381 new internal::MessageLoopProxyImpl(incoming_task_queue_);
382 thread_task_runner_handle_.reset( 382 thread_task_runner_handle_.reset(
383 new ThreadTaskRunnerHandle(message_loop_proxy_)); 383 new ThreadTaskRunnerHandle(message_loop_proxy_));
384 } 384 }
385 385
386 void MessageLoop::RunHandler() { 386 void MessageLoop::RunHandler() {
387 DCHECK_EQ(this, current()); 387 DCHECK_EQ(this, current());
388 388
389 StartHistogrammer(); 389 StartHistogrammer();
390 390
391 #if defined(USE_AURA) 391 #if defined(OS_WIN)
392 if (run_loop_->dispatcher_ && type() == TYPE_UI) { 392 if (run_loop_->dispatcher_ && type() == TYPE_UI) {
393 static_cast<MessagePumpForUI*>(pump_.get())-> 393 static_cast<MessagePumpForUI*>(pump_.get())->
394 RunWithDispatcher(this, run_loop_->dispatcher_); 394 RunWithDispatcher(this, run_loop_->dispatcher_);
395 return; 395 return;
396 } 396 }
397 #endif 397 #endif
398 398
399 pump_->Run(this); 399 pump_->Run(this);
400 } 400 }
401 401
(...skipping 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
720 fd, 720 fd,
721 persistent, 721 persistent,
722 mode, 722 mode,
723 controller, 723 controller,
724 delegate); 724 delegate);
725 } 725 }
726 726
727 #endif 727 #endif
728 728
729 } // namespace base 729 } // namespace base
OLDNEW
« no previous file with comments | « ash/ash.gyp ('k') | base/message_loop/message_pump_x11.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698