| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/webdata/web_data_service.h" | 5 #include "chrome/browser/webdata/web_data_service.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
| 9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
| 10 #include "base/threading/thread.h" | 10 #include "base/threading/thread.h" |
| (...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 734 | 734 |
| 735 void WebDataService::GetKeywordsImpl(WebDataRequest* request) { | 735 void WebDataService::GetKeywordsImpl(WebDataRequest* request) { |
| 736 InitializeDatabaseIfNecessary(); | 736 InitializeDatabaseIfNecessary(); |
| 737 if (db_ && !request->IsCancelled(NULL)) { | 737 if (db_ && !request->IsCancelled(NULL)) { |
| 738 WDKeywordsResult result; | 738 WDKeywordsResult result; |
| 739 db_->GetKeywordTable()->GetKeywords(&result.keywords); | 739 db_->GetKeywordTable()->GetKeywords(&result.keywords); |
| 740 result.default_search_provider_id = | 740 result.default_search_provider_id = |
| 741 db_->GetKeywordTable()->GetDefaultSearchProviderID(); | 741 db_->GetKeywordTable()->GetDefaultSearchProviderID(); |
| 742 result.builtin_keyword_version = | 742 result.builtin_keyword_version = |
| 743 db_->GetKeywordTable()->GetBuiltinKeywordVersion(); | 743 db_->GetKeywordTable()->GetBuiltinKeywordVersion(); |
| 744 result.default_search_provider_id_backup = |
| 745 db_->GetKeywordTable()->GetDefaultSearchProviderIDBackup(); |
| 746 result.did_default_search_provider_change = |
| 747 db_->GetKeywordTable()->DidDefaultSearchProviderChange(); |
| 744 request->SetResult( | 748 request->SetResult( |
| 745 new WDResult<WDKeywordsResult>(KEYWORDS_RESULT, result)); | 749 new WDResult<WDKeywordsResult>(KEYWORDS_RESULT, result)); |
| 746 } | 750 } |
| 747 request->RequestComplete(); | 751 request->RequestComplete(); |
| 748 } | 752 } |
| 749 | 753 |
| 750 void WebDataService::SetDefaultSearchProviderImpl( | 754 void WebDataService::SetDefaultSearchProviderImpl( |
| 751 GenericRequest<TemplateURLID>* request) { | 755 GenericRequest<TemplateURLID>* request) { |
| 752 InitializeDatabaseIfNecessary(); | 756 InitializeDatabaseIfNecessary(); |
| 753 if (db_ && !request->IsCancelled(NULL)) { | 757 if (db_ && !request->IsCancelled(NULL)) { |
| (...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1431 } | 1435 } |
| 1432 | 1436 |
| 1433 const WDTypedResult* WebDataService::WebDataRequest::GetResult() const { | 1437 const WDTypedResult* WebDataService::WebDataRequest::GetResult() const { |
| 1434 return result_; | 1438 return result_; |
| 1435 } | 1439 } |
| 1436 | 1440 |
| 1437 void WebDataService::WebDataRequest::RequestComplete() { | 1441 void WebDataService::WebDataRequest::RequestComplete() { |
| 1438 message_loop_->PostTask(FROM_HERE, Bind(&WebDataService::RequestCompleted, | 1442 message_loop_->PostTask(FROM_HERE, Bind(&WebDataService::RequestCompleted, |
| 1439 service_.get(), handle_)); | 1443 service_.get(), handle_)); |
| 1440 } | 1444 } |
| OLD | NEW |