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

Side by Side Diff: chrome/browser/webdata/web_data_service.cc

Issue 8342049: Added Protector, hooked up DSE verification with error bubble. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved histograms to protector folder Created 9 years, 1 month 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 (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 731 matching lines...) Expand 10 before | Expand all | Expand 10 after
742 742
743 void WebDataService::GetKeywordsImpl(WebDataRequest* request) { 743 void WebDataService::GetKeywordsImpl(WebDataRequest* request) {
744 InitializeDatabaseIfNecessary(); 744 InitializeDatabaseIfNecessary();
745 if (db_ && !request->IsCancelled(NULL)) { 745 if (db_ && !request->IsCancelled(NULL)) {
746 WDKeywordsResult result; 746 WDKeywordsResult result;
747 db_->GetKeywordTable()->GetKeywords(&result.keywords); 747 db_->GetKeywordTable()->GetKeywords(&result.keywords);
748 result.default_search_provider_id = 748 result.default_search_provider_id =
749 db_->GetKeywordTable()->GetDefaultSearchProviderID(); 749 db_->GetKeywordTable()->GetDefaultSearchProviderID();
750 result.builtin_keyword_version = 750 result.builtin_keyword_version =
751 db_->GetKeywordTable()->GetBuiltinKeywordVersion(); 751 db_->GetKeywordTable()->GetBuiltinKeywordVersion();
752 result.default_search_provider_id_backup =
753 db_->GetKeywordTable()->GetDefaultSearchProviderIDBackup();
754 result.did_default_search_provider_change =
755 db_->GetKeywordTable()->DidDefaultSearchProviderChange();
752 request->SetResult( 756 request->SetResult(
753 new WDResult<WDKeywordsResult>(KEYWORDS_RESULT, result)); 757 new WDResult<WDKeywordsResult>(KEYWORDS_RESULT, result));
754 } 758 }
755 request->RequestComplete(); 759 request->RequestComplete();
756 } 760 }
757 761
758 void WebDataService::SetDefaultSearchProviderImpl( 762 void WebDataService::SetDefaultSearchProviderImpl(
759 GenericRequest<TemplateURLID>* request) { 763 GenericRequest<TemplateURLID>* request) {
760 InitializeDatabaseIfNecessary(); 764 InitializeDatabaseIfNecessary();
761 if (db_ && !request->IsCancelled(NULL)) { 765 if (db_ && !request->IsCancelled(NULL)) {
(...skipping 677 matching lines...) Expand 10 before | Expand all | Expand 10 after
1439 } 1443 }
1440 1444
1441 const WDTypedResult* WebDataService::WebDataRequest::GetResult() const { 1445 const WDTypedResult* WebDataService::WebDataRequest::GetResult() const {
1442 return result_; 1446 return result_;
1443 } 1447 }
1444 1448
1445 void WebDataService::WebDataRequest::RequestComplete() { 1449 void WebDataService::WebDataRequest::RequestComplete() {
1446 message_loop_->PostTask(FROM_HERE, Bind(&WebDataService::RequestCompleted, 1450 message_loop_->PostTask(FROM_HERE, Bind(&WebDataService::RequestCompleted,
1447 service_.get(), handle_)); 1451 service_.get(), handle_));
1448 } 1452 }
OLDNEW
« no previous file with comments | « chrome/browser/webdata/web_data_service.h ('k') | chrome/browser/webdata/web_data_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698