diff options
| author | Jakub Pawlowski <jpawlowski@google.com> | 2017-03-14 10:55:53 -0700 |
|---|---|---|
| committer | Jakub Pawlowski <jpawlowski@google.com> | 2017-12-22 03:06:26 -0800 |
| commit | 319afc59a539d6261307aadbdab4d4ee93eaf1ff (patch) | |
| tree | 0f21b95ba579352a9829d3868c7365d4f9dde210 /base/message_loop/message_loop.h | |
| parent | 8abac493f652a1835c61e538919820aa77658a39 (diff) | |
| download | libchrome-319afc59a539d6261307aadbdab4d4ee93eaf1ff.tar.gz | |
Uprev the library to r462023 from Chromium, 3rd attempt
This merge was done against r462023 which corresponds to git commit
32eb7c31af9cab6231f0d3d05206072079177605 from Apr 05, 2017
First attempt, in commit bf8c17f71511c1e90cd8cccfe71f0852c566bd3b was
badly squashed, causing automated test failure in system/bt.
Next one broke mac build.
Test: manually ran all test from system/bt that failed on previous
attempt, plus libchrome_unittest
Change-Id: I60003263418de3078c7be2da9fb1eeaeb786f3d0
Diffstat (limited to 'base/message_loop/message_loop.h')
| -rw-r--r-- | base/message_loop/message_loop.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/base/message_loop/message_loop.h b/base/message_loop/message_loop.h index bfef261c38..6b4765bd1b 100644 --- a/base/message_loop/message_loop.h +++ b/base/message_loop/message_loop.h @@ -320,6 +320,8 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate { // Runs the specified PendingTask. void RunTask(PendingTask* pending_task); + bool nesting_allowed() const { return allow_nesting_; } + // Disallow nesting. After this is called, running a nested RunLoop or calling // Add/RemoveNestingObserver() on this MessageLoop will crash. void DisallowNesting() { allow_nesting_ = false; } |