diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 19:17:08 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-19 19:17:08 +0000 |
| commit | ee432ee0a565736be395b8729bc811212fd88bf3 (patch) | |
| tree | 4922e685fc7e392d3b67029d4a821adc9d323f1a /ceee/ie/broker | |
| parent | 1d14ba55e2472ad65b41423a6b8ed13b32dc206d (diff) | |
| download | chromium_src-ee432ee0a565736be395b8729bc811212fd88bf3.zip chromium_src-ee432ee0a565736be395b8729bc811212fd88bf3.tar.gz chromium_src-ee432ee0a565736be395b8729bc811212fd88bf3.tar.bz2 | |
Revert 66719 - Reland r65996. Disallows Singletons on non-joinable thread.
Test breakages caused by this change have been fixed here or in other changelists.
BUG=61753
TEST=none
Review URL: http://codereview.chromium.org/5024003
TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/5206005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66791 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ceee/ie/broker')
| -rw-r--r-- | ceee/ie/broker/executors_manager.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ceee/ie/broker/executors_manager.h b/ceee/ie/broker/executors_manager.h index cba7b3f..3b9ac3b 100644 --- a/ceee/ie/broker/executors_manager.h +++ b/ceee/ie/broker/executors_manager.h @@ -90,10 +90,14 @@ class ExecutorsManager { // Traits for Singleton<ExecutorsManager> so that we can pass an argument // to the constructor. - struct SingletonTraits : public DefaultSingletonTraits<ExecutorsManager> { + struct SingletonTraits { static ExecutorsManager* New() { return new ExecutorsManager(false); // By default, we want a thread. } + static void Delete(ExecutorsManager* x) { + delete x; + } + static const bool kRegisterAtExit = true; }; protected: |