| Index: chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
|
| diff --git a/chrome/browser/autocomplete/chrome_autocomplete_provider_delegate.cc b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
|
| similarity index 76%
|
| rename from chrome/browser/autocomplete/chrome_autocomplete_provider_delegate.cc
|
| rename to chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
|
| index e15407ea473f969bf5bd6d7521ba1e20386d6382..b548d1ef2c9a616afb3f2fbe8ec80abcc93b4621 100644
|
| --- a/chrome/browser/autocomplete/chrome_autocomplete_provider_delegate.cc
|
| +++ b/chrome/browser/autocomplete/chrome_autocomplete_provider_client.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/autocomplete/chrome_autocomplete_provider_delegate.h"
|
| +#include "chrome/browser/autocomplete/chrome_autocomplete_provider_client.h"
|
|
|
| #include "base/prefs/pref_service.h"
|
| #include "chrome/browser/autocomplete/autocomplete_classifier.h"
|
| @@ -16,42 +16,42 @@
|
| #include "chrome/browser/sync/profile_sync_service_factory.h"
|
| #include "chrome/common/pref_names.h"
|
|
|
| -ChromeAutocompleteProviderDelegate::ChromeAutocompleteProviderDelegate(
|
| +ChromeAutocompleteProviderClient::ChromeAutocompleteProviderClient(
|
| Profile* profile)
|
| : profile_(profile),
|
| scheme_classifier_(profile) {
|
| }
|
|
|
| -ChromeAutocompleteProviderDelegate::~ChromeAutocompleteProviderDelegate() {
|
| +ChromeAutocompleteProviderClient::~ChromeAutocompleteProviderClient() {
|
| }
|
|
|
| net::URLRequestContextGetter*
|
| -ChromeAutocompleteProviderDelegate::RequestContext() {
|
| +ChromeAutocompleteProviderClient::RequestContext() {
|
| return profile_->GetRequestContext();
|
| }
|
|
|
| -bool ChromeAutocompleteProviderDelegate::IsOffTheRecord() {
|
| +bool ChromeAutocompleteProviderClient::IsOffTheRecord() {
|
| return profile_->IsOffTheRecord();
|
| }
|
|
|
| -std::string ChromeAutocompleteProviderDelegate::AcceptLanguages() {
|
| +std::string ChromeAutocompleteProviderClient::AcceptLanguages() {
|
| return profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
|
| }
|
|
|
| -bool ChromeAutocompleteProviderDelegate::SearchSuggestEnabled() {
|
| +bool ChromeAutocompleteProviderClient::SearchSuggestEnabled() {
|
| return profile_->GetPrefs()->GetBoolean(prefs::kSearchSuggestEnabled);
|
| }
|
|
|
| -bool ChromeAutocompleteProviderDelegate::ShowBookmarkBar() {
|
| +bool ChromeAutocompleteProviderClient::ShowBookmarkBar() {
|
| return profile_->GetPrefs()->GetBoolean(bookmarks::prefs::kShowBookmarkBar);
|
| }
|
|
|
| const AutocompleteSchemeClassifier&
|
| -ChromeAutocompleteProviderDelegate::SchemeClassifier() {
|
| +ChromeAutocompleteProviderClient::SchemeClassifier() {
|
| return scheme_classifier_;
|
| }
|
|
|
| -void ChromeAutocompleteProviderDelegate::Classify(
|
| +void ChromeAutocompleteProviderClient::Classify(
|
| const base::string16& text,
|
| bool prefer_keyword,
|
| bool allow_exact_keyword_match,
|
| @@ -65,21 +65,20 @@ void ChromeAutocompleteProviderDelegate::Classify(
|
| page_classification, match, alternate_nav_url);
|
| }
|
|
|
| -history::URLDatabase* ChromeAutocompleteProviderDelegate::InMemoryDatabase() {
|
| +history::URLDatabase* ChromeAutocompleteProviderClient::InMemoryDatabase() {
|
| HistoryService* history_service =
|
| HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS);
|
| return history_service ? history_service->InMemoryDatabase() : NULL;
|
| }
|
|
|
| -void
|
| -ChromeAutocompleteProviderDelegate::DeleteMatchingURLsForKeywordFromHistory(
|
| +void ChromeAutocompleteProviderClient::DeleteMatchingURLsForKeywordFromHistory(
|
| history::KeywordID keyword_id,
|
| const base::string16& term) {
|
| HistoryServiceFactory::GetForProfile(profile_, Profile::EXPLICIT_ACCESS)
|
| ->DeleteMatchingURLsForKeyword(keyword_id, term);
|
| }
|
|
|
| -bool ChromeAutocompleteProviderDelegate::TabSyncEnabledAndUnencrypted() {
|
| +bool ChromeAutocompleteProviderClient::TabSyncEnabledAndUnencrypted() {
|
| // Check field trials and settings allow sending the URL on suggest requests.
|
| ProfileSyncService* service =
|
| ProfileSyncServiceFactory::GetInstance()->GetForProfile(profile_);
|
| @@ -91,7 +90,7 @@ bool ChromeAutocompleteProviderDelegate::TabSyncEnabledAndUnencrypted() {
|
| !service->GetEncryptedDataTypes().Has(syncer::SESSIONS);
|
| }
|
|
|
| -void ChromeAutocompleteProviderDelegate::PrefetchImage(const GURL& url) {
|
| +void ChromeAutocompleteProviderClient::PrefetchImage(const GURL& url) {
|
| BitmapFetcherService* image_service =
|
| BitmapFetcherServiceFactory::GetForBrowserContext(profile_);
|
| DCHECK(image_service);
|
|
|