| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "components/search_engines/template_url_service.h" | 5 #include "components/search_engines/template_url_service.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 604 } | 604 } |
| 605 | 605 |
| 606 void TemplateURLService::ResetTemplateURL(TemplateURL* url, | 606 void TemplateURLService::ResetTemplateURL(TemplateURL* url, |
| 607 const base::string16& title, | 607 const base::string16& title, |
| 608 const base::string16& keyword, | 608 const base::string16& keyword, |
| 609 const std::string& search_url) { | 609 const std::string& search_url) { |
| 610 if (ResetTemplateURLNoNotify(url, title, keyword, search_url)) | 610 if (ResetTemplateURLNoNotify(url, title, keyword, search_url)) |
| 611 NotifyObservers(); | 611 NotifyObservers(); |
| 612 } | 612 } |
| 613 | 613 |
| 614 void TemplateURLService::UpdateTemplateURLVisitTime(TemplateURL* url) { |
| 615 TemplateURLData data(url->data()); |
| 616 data.last_visited = clock_->Now(); |
| 617 Update(url, TemplateURL(data)); |
| 618 } |
| 619 |
| 620 |
| 614 bool TemplateURLService::CanMakeDefault(const TemplateURL* url) { | 621 bool TemplateURLService::CanMakeDefault(const TemplateURL* url) { |
| 615 return | 622 return |
| 616 ((default_search_provider_source_ == DefaultSearchManager::FROM_USER) || | 623 ((default_search_provider_source_ == DefaultSearchManager::FROM_USER) || |
| 617 (default_search_provider_source_ == | 624 (default_search_provider_source_ == |
| 618 DefaultSearchManager::FROM_FALLBACK)) && | 625 DefaultSearchManager::FROM_FALLBACK)) && |
| 619 (url != GetDefaultSearchProvider()) && | 626 (url != GetDefaultSearchProvider()) && |
| 620 url->url_ref().SupportsReplacement(search_terms_data()) && | 627 url->url_ref().SupportsReplacement(search_terms_data()) && |
| 621 (url->type() == TemplateURL::NORMAL); | 628 (url->type() == TemplateURL::NORMAL); |
| 622 } | 629 } |
| 623 | 630 |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 723 DefaultSearchManager::Source source; | 730 DefaultSearchManager::Source source; |
| 724 const TemplateURLData* new_dse = | 731 const TemplateURLData* new_dse = |
| 725 default_search_manager_.GetDefaultSearchEngine(&source); | 732 default_search_manager_.GetDefaultSearchEngine(&source); |
| 726 // ApplyDefaultSearchChange will notify observers once it is done. | 733 // ApplyDefaultSearchChange will notify observers once it is done. |
| 727 ApplyDefaultSearchChange(new_dse, source); | 734 ApplyDefaultSearchChange(new_dse, source); |
| 728 } else { | 735 } else { |
| 729 NotifyObservers(); | 736 NotifyObservers(); |
| 730 } | 737 } |
| 731 } | 738 } |
| 732 | 739 |
| 733 void TemplateURLService::UpdateTemplateURLVisitTime(TemplateURL* url) { | |
| 734 TemplateURLData data(url->data()); | |
| 735 data.last_visited = clock_->Now(); | |
| 736 Update(url, TemplateURL(data)); | |
| 737 } | |
| 738 | |
| 739 void TemplateURLService::AddObserver(TemplateURLServiceObserver* observer) { | 740 void TemplateURLService::AddObserver(TemplateURLServiceObserver* observer) { |
| 740 model_observers_.AddObserver(observer); | 741 model_observers_.AddObserver(observer); |
| 741 } | 742 } |
| 742 | 743 |
| 743 void TemplateURLService::RemoveObserver(TemplateURLServiceObserver* observer) { | 744 void TemplateURLService::RemoveObserver(TemplateURLServiceObserver* observer) { |
| 744 model_observers_.RemoveObserver(observer); | 745 model_observers_.RemoveObserver(observer); |
| 745 } | 746 } |
| 746 | 747 |
| 747 void TemplateURLService::Load() { | 748 void TemplateURLService::Load() { |
| 748 if (loaded_ || load_handle_ || disable_load_) | 749 if (loaded_ || load_handle_ || disable_load_) |
| (...skipping 1747 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2496 | 2497 |
| 2497 if (most_recently_intalled_default) { | 2498 if (most_recently_intalled_default) { |
| 2498 base::AutoReset<DefaultSearchChangeOrigin> change_origin( | 2499 base::AutoReset<DefaultSearchChangeOrigin> change_origin( |
| 2499 &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION); | 2500 &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION); |
| 2500 default_search_manager_.SetExtensionControlledDefaultSearchEngine( | 2501 default_search_manager_.SetExtensionControlledDefaultSearchEngine( |
| 2501 most_recently_intalled_default->data()); | 2502 most_recently_intalled_default->data()); |
| 2502 } else { | 2503 } else { |
| 2503 default_search_manager_.ClearExtensionControlledDefaultSearchEngine(); | 2504 default_search_manager_.ClearExtensionControlledDefaultSearchEngine(); |
| 2504 } | 2505 } |
| 2505 } | 2506 } |
| OLD | NEW |