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

Side by Side Diff: base/run_loop.cc

Issue 135563004: Nukes MessageLoop::Dispatcher (2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 11 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/run_loop.h" 5 #include "base/run_loop.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 8
9 #if defined(USE_AURA)
10 #include "base/message_loop/message_pump_dispatcher.h"
11 #endif
12
9 namespace base { 13 namespace base {
10 14
11 RunLoop::RunLoop() 15 RunLoop::RunLoop()
12 : loop_(MessageLoop::current()), 16 : loop_(MessageLoop::current()),
13 previous_run_loop_(NULL), 17 previous_run_loop_(NULL),
14 run_depth_(0), 18 run_depth_(0),
15 run_called_(false), 19 run_called_(false),
16 quit_called_(false), 20 quit_called_(false),
17 running_(false), 21 running_(false),
18 quit_when_idle_received_(false), 22 quit_when_idle_received_(false),
19 weak_factory_(this) { 23 weak_factory_(this) {
20 #if defined(USE_AURA) 24 #if defined(USE_AURA)
21 dispatcher_ = NULL; 25 dispatcher_ = NULL;
22 #endif 26 #endif
23 } 27 }
24 28
25 #if defined(USE_AURA) 29 #if defined(USE_AURA)
26 RunLoop::RunLoop(MessageLoop::Dispatcher* dispatcher) 30 RunLoop::RunLoop(MessagePumpDispatcher* dispatcher)
27 : loop_(MessageLoop::current()), 31 : loop_(MessageLoop::current()),
28 previous_run_loop_(NULL), 32 previous_run_loop_(NULL),
29 dispatcher_(dispatcher), 33 dispatcher_(dispatcher),
30 run_depth_(0), 34 run_depth_(0),
31 run_called_(false), 35 run_called_(false),
32 quit_called_(false), 36 quit_called_(false),
33 running_(false), 37 running_(false),
34 quit_when_idle_received_(false), 38 quit_when_idle_received_(false),
35 weak_factory_(this) { 39 weak_factory_(this) {
36 } 40 }
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 89
86 // Pop RunLoop stack: 90 // Pop RunLoop stack:
87 loop_->run_loop_ = previous_run_loop_; 91 loop_->run_loop_ = previous_run_loop_;
88 92
89 // Execute deferred QuitNow, if any: 93 // Execute deferred QuitNow, if any:
90 if (previous_run_loop_ && previous_run_loop_->quit_called_) 94 if (previous_run_loop_ && previous_run_loop_->quit_called_)
91 loop_->QuitNow(); 95 loop_->QuitNow();
92 } 96 }
93 97
94 } // namespace base 98 } // namespace base
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698