| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.
h" | 5 #include "chrome/browser/chromeos/login/signin/merge_session_xhr_request_waiter.
h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/lazy_instance.h" | 8 #include "base/lazy_instance.h" |
| 9 #include "base/location.h" |
| 9 #include "base/logging.h" | 10 #include "base/logging.h" |
| 10 #include "base/memory/weak_ptr.h" | 11 #include "base/memory/weak_ptr.h" |
| 11 #include "base/message_loop/message_loop.h" | 12 #include "base/single_thread_task_runner.h" |
| 13 #include "base/threading/thread_task_runner_handle.h" |
| 12 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" | 14 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h" |
| 13 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" | 15 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h" |
| 14 #include "content/public/browser/browser_thread.h" | 16 #include "content/public/browser/browser_thread.h" |
| 15 | 17 |
| 16 using content::BrowserThread; | 18 using content::BrowserThread; |
| 17 | 19 |
| 18 namespace chromeos { | 20 namespace chromeos { |
| 19 | 21 |
| 20 namespace { | 22 namespace { |
| 21 | 23 |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 NotifyBlockingDone(); | 79 NotifyBlockingDone(); |
| 78 } | 80 } |
| 79 | 81 |
| 80 void MergeSessionXHRRequestWaiter::NotifyBlockingDone() { | 82 void MergeSessionXHRRequestWaiter::NotifyBlockingDone() { |
| 81 DCHECK_CURRENTLY_ON(BrowserThread::UI); | 83 DCHECK_CURRENTLY_ON(BrowserThread::UI); |
| 82 if (!callback_.is_null()) { | 84 if (!callback_.is_null()) { |
| 83 BrowserThread::PostTask( | 85 BrowserThread::PostTask( |
| 84 BrowserThread::IO, FROM_HERE, callback_); | 86 BrowserThread::IO, FROM_HERE, callback_); |
| 85 } | 87 } |
| 86 weak_ptr_factory_.InvalidateWeakPtrs(); | 88 weak_ptr_factory_.InvalidateWeakPtrs(); |
| 87 base::MessageLoop::current()->DeleteSoon(FROM_HERE, this); | 89 base::ThreadTaskRunnerHandle::Get()->DeleteSoon(FROM_HERE, this); |
| 88 } | 90 } |
| 89 | 91 |
| 90 } // namespace chromeos | 92 } // namespace chromeos |
| OLD | NEW |