Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "chrome/browser/history/android/sqlite_cursor.h" | 5 #include "chrome/browser/history/android/sqlite_cursor.h" |
| 6 | 6 |
| 7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
| 8 #include "base/android/jni_array.h" | 8 #include "base/android/jni_array.h" |
| 9 #include "base/android/jni_string.h" | 9 #include "base/android/jni_string.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| (...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 149 test_observer_(NULL) { | 149 test_observer_(NULL) { |
| 150 } | 150 } |
| 151 | 151 |
| 152 SQLiteCursor::~SQLiteCursor() { | 152 SQLiteCursor::~SQLiteCursor() { |
| 153 // Consumer requests were set in the UI thread. They must be cancelled | 153 // Consumer requests were set in the UI thread. They must be cancelled |
| 154 // using the same thread. | 154 // using the same thread. |
| 155 if (BrowserThread::CurrentlyOn(BrowserThread::UI)) { | 155 if (BrowserThread::CurrentlyOn(BrowserThread::UI)) { |
| 156 CancelAllRequests(NULL); | 156 CancelAllRequests(NULL); |
| 157 } else { | 157 } else { |
| 158 base::WaitableEvent event(false, false); | 158 base::WaitableEvent event(false, false); |
| 159 BrowserThread::PostTask( | 159 if (BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, |
| 160 BrowserThread::UI, | |
| 161 FROM_HERE, | |
| 162 base::Bind(&SQLiteCursor::CancelAllRequests, base::Unretained(this), | 160 base::Bind(&SQLiteCursor::CancelAllRequests, base::Unretained(this), |
| 163 &event)); | 161 &event))) |
|
Yaron
2013/05/30 18:14:00
Please add {}
michaelbai
2013/05/30 18:33:56
Done.
| |
| 164 event.Wait(); | 162 event.Wait(); |
| 165 } | 163 } |
| 166 | 164 |
| 167 BrowserThread::PostTask( | 165 BrowserThread::PostTask( |
| 168 BrowserThread::UI, | 166 BrowserThread::UI, |
| 169 FROM_HERE, | 167 FROM_HERE, |
| 170 base::Bind(&AndroidHistoryProviderService::CloseStatement, | 168 base::Bind(&AndroidHistoryProviderService::CloseStatement, |
| 171 base::Unretained(service_), statement_)); | 169 base::Unretained(service_), statement_)); |
| 172 } | 170 } |
| 173 | 171 |
| 174 bool SQLiteCursor::GetFavicon(chrome::FaviconID id, | 172 bool SQLiteCursor::GetFavicon(chrome::FaviconID id, |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 245 } | 243 } |
| 246 | 244 |
| 247 void SQLiteCursor::RunMoveStatementOnUIThread(int pos) { | 245 void SQLiteCursor::RunMoveStatementOnUIThread(int pos) { |
| 248 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 246 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 249 if (!consumer_.get()) | 247 if (!consumer_.get()) |
| 250 consumer_.reset(new CancelableRequestConsumer()); | 248 consumer_.reset(new CancelableRequestConsumer()); |
| 251 service_->MoveStatement( | 249 service_->MoveStatement( |
| 252 statement_, position_, pos, consumer_.get(), | 250 statement_, position_, pos, consumer_.get(), |
| 253 base::Bind(&SQLiteCursor::OnMoved, base::Unretained(this))); | 251 base::Bind(&SQLiteCursor::OnMoved, base::Unretained(this))); |
| 254 } | 252 } |
| OLD | NEW |