OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 "android_webview/browser/aw_form_database_service.h" | 5 #include "android_webview/browser/aw_form_database_service.h" |
6 | 6 |
7 #include "base/logging.h" | 7 #include "base/logging.h" |
8 #include "base/memory/ptr_util.h" | 8 #include "base/memory/ptr_util.h" |
9 #include "base/synchronization/waitable_event.h" | 9 #include "base/synchronization/waitable_event.h" |
10 #include "components/autofill/core/browser/webdata/autofill_table.h" | 10 #include "components/autofill/core/browser/webdata/autofill_table.h" |
11 #include "components/webdata/common/webdata_constants.h" | 11 #include "components/webdata/common/webdata_constants.h" |
12 #include "content/public/browser/browser_thread.h" | 12 #include "content/public/browser/browser_thread.h" |
13 | 13 |
14 using base::WaitableEvent; | 14 using base::WaitableEvent; |
15 using content::BrowserThread; | 15 using content::BrowserThread; |
16 | 16 |
17 namespace { | 17 namespace { |
18 | 18 |
19 // Callback to handle database error. It seems chrome uses this to | 19 // Callback to handle database error. It seems chrome uses this to |
20 // display an error dialog box only. | 20 // display an error dialog box only. |
21 void DatabaseErrorCallback(sql::InitStatus status) { | 21 void DatabaseErrorCallback(sql::InitStatus init_status, |
| 22 const std::string& diagnostics) { |
22 LOG(WARNING) << "initializing autocomplete database failed"; | 23 LOG(WARNING) << "initializing autocomplete database failed"; |
23 } | 24 } |
24 | 25 |
25 } // namespace | 26 } // namespace |
26 | 27 |
27 namespace android_webview { | 28 namespace android_webview { |
28 | 29 |
29 AwFormDatabaseService::AwFormDatabaseService(const base::FilePath path) { | 30 AwFormDatabaseService::AwFormDatabaseService(const base::FilePath path) { |
30 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 31 CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
31 web_database_ = new WebDatabaseService( | 32 web_database_ = new WebDatabaseService( |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 if (it == result_map_.end()) { | 120 if (it == result_map_.end()) { |
120 LOG(WARNING) << "Received unexpected callback from web data service"; | 121 LOG(WARNING) << "Received unexpected callback from web data service"; |
121 return; | 122 return; |
122 } | 123 } |
123 *(it->second.result) = has_form_data; | 124 *(it->second.result) = has_form_data; |
124 it->second.completion->Signal(); | 125 it->second.completion->Signal(); |
125 result_map_.erase(h); | 126 result_map_.erase(h); |
126 } | 127 } |
127 | 128 |
128 } // namespace android_webview | 129 } // namespace android_webview |
OLD | NEW |