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

Side by Side Diff: chrome/browser/extensions/api/system_info/system_info_provider.cc

Issue 216513002: Replace DCHECK(BrowserThread::CurrentlyOn) with DCHECK_CURRENTLY_ON in extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 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 "chrome/browser/extensions/api/system_info/system_info_provider.h" 5 #include "chrome/browser/extensions/api/system_info/system_info_provider.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "content/public/browser/browser_thread.h" 8 #include "content/public/browser/browser_thread.h"
9 9
10 namespace extensions { 10 namespace extensions {
(...skipping 10 matching lines...) Expand all
21 21
22 void SystemInfoProvider::PrepareQueryOnUIThread() {} 22 void SystemInfoProvider::PrepareQueryOnUIThread() {}
23 23
24 void SystemInfoProvider::InitializeProvider(const base::Closure& 24 void SystemInfoProvider::InitializeProvider(const base::Closure&
25 do_query_info_callback) { 25 do_query_info_callback) {
26 do_query_info_callback.Run(); 26 do_query_info_callback.Run();
27 } 27 }
28 28
29 void SystemInfoProvider::StartQueryInfo( 29 void SystemInfoProvider::StartQueryInfo(
30 const QueryInfoCompletionCallback& callback) { 30 const QueryInfoCompletionCallback& callback) {
31 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 31 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
32 DCHECK(!callback.is_null()); 32 DCHECK(!callback.is_null());
33 33
34 callbacks_.push(callback); 34 callbacks_.push(callback);
35 35
36 if (is_waiting_for_completion_) 36 if (is_waiting_for_completion_)
37 return; 37 return;
38 38
39 is_waiting_for_completion_ = true; 39 is_waiting_for_completion_ = true;
40 40
41 InitializeProvider(base::Bind( 41 InitializeProvider(base::Bind(
42 &SystemInfoProvider::StartQueryInfoPostInitialization, this)); 42 &SystemInfoProvider::StartQueryInfoPostInitialization, this));
43 } 43 }
44 44
45 void SystemInfoProvider::OnQueryCompleted(bool success) { 45 void SystemInfoProvider::OnQueryCompleted(bool success) {
46 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); 46 DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
47 47
48 while (!callbacks_.empty()) { 48 while (!callbacks_.empty()) {
49 QueryInfoCompletionCallback callback = callbacks_.front(); 49 QueryInfoCompletionCallback callback = callbacks_.front();
50 callback.Run(success); 50 callback.Run(success);
51 callbacks_.pop(); 51 callbacks_.pop();
52 } 52 }
53 53
54 is_waiting_for_completion_ = false; 54 is_waiting_for_completion_ = false;
55 } 55 }
56 56
57 void SystemInfoProvider::StartQueryInfoPostInitialization() { 57 void SystemInfoProvider::StartQueryInfoPostInitialization() {
58 PrepareQueryOnUIThread(); 58 PrepareQueryOnUIThread();
59 // Post the custom query info task to blocking pool for information querying 59 // Post the custom query info task to blocking pool for information querying
60 // and reply with OnQueryCompleted. 60 // and reply with OnQueryCompleted.
61 base::PostTaskAndReplyWithResult( 61 base::PostTaskAndReplyWithResult(
62 worker_pool_, 62 worker_pool_,
63 FROM_HERE, 63 FROM_HERE,
64 base::Bind(&SystemInfoProvider::QueryInfo, this), 64 base::Bind(&SystemInfoProvider::QueryInfo, this),
65 base::Bind(&SystemInfoProvider::OnQueryCompleted, this)); 65 base::Bind(&SystemInfoProvider::OnQueryCompleted, this));
66 } 66 }
67 67
68 } // namespace extensions 68 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698