summaryrefslogtreecommitdiffstats
path: root/chrome/browser/autocomplete
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-22 22:52:59 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-22 22:52:59 +0000
commit15fb2aadeb85e93964d5c34bb52ad94f35fc01cb (patch)
tree7b66c4fd1b9ba70f081f93c1692618d4a65b03bc /chrome/browser/autocomplete
parent3d6dfd5dd689a33c77f9032194616f75e59be1be (diff)
downloadchromium_src-15fb2aadeb85e93964d5c34bb52ad94f35fc01cb.zip
chromium_src-15fb2aadeb85e93964d5c34bb52ad94f35fc01cb.tar.gz
chromium_src-15fb2aadeb85e93964d5c34bb52ad94f35fc01cb.tar.bz2
Remove content::URLFetcherDelegate
Change all references to net::URLFetcherDelegate. Change some instances of content::URLFetcher to net::URLFetcher as needed. Remove unused files auth_response_handler.*. BUG=118220 TEST= TBR=sky@chromium.org,joi@chromium.org,mnissler@chromium.org,rlp@chromium.org Review URL: https://chromiumcodereview.appspot.com/10392192 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@138384 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/autocomplete')
-rw-r--r--chrome/browser/autocomplete/search_provider.cc2
-rw-r--r--chrome/browser/autocomplete/search_provider.h16
2 files changed, 11 insertions, 7 deletions
diff --git a/chrome/browser/autocomplete/search_provider.cc b/chrome/browser/autocomplete/search_provider.cc
index a18e2be3..0b99f09 100644
--- a/chrome/browser/autocomplete/search_provider.cc
+++ b/chrome/browser/autocomplete/search_provider.cc
@@ -530,7 +530,7 @@ void SearchProvider::ClearResults() {
have_suggest_results_ = false;
}
-content::URLFetcher* SearchProvider::CreateSuggestFetcher(
+net::URLFetcher* SearchProvider::CreateSuggestFetcher(
int id,
const TemplateURLRef& suggestions_url,
const string16& text) {
diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h
index 5c22c53..aa66ca5 100644
--- a/chrome/browser/autocomplete/search_provider.h
+++ b/chrome/browser/autocomplete/search_provider.h
@@ -27,7 +27,7 @@
#include "chrome/browser/history/history_types.h"
#include "chrome/browser/search_engines/template_url.h"
#include "chrome/browser/search_engines/template_url_id.h"
-#include "content/public/common/url_fetcher_delegate.h"
+#include "net/url_request/url_fetcher_delegate.h"
class Profile;
class TemplateURLService;
@@ -36,6 +36,10 @@ namespace base {
class Value;
}
+namespace net {
+class URLFetcher;
+}
+
// Autocomplete provider for searches and suggestions from a search engine.
//
// After construction, the autocomplete controller repeatedly calls Start()
@@ -47,7 +51,7 @@ class Value;
// comes back, the provider creates and returns matches for the best
// suggestions.
class SearchProvider : public AutocompleteProvider,
- public content::URLFetcherDelegate {
+ public net::URLFetcherDelegate {
public:
SearchProvider(ACProviderListener* listener, Profile* profile);
@@ -75,7 +79,7 @@ class SearchProvider : public AutocompleteProvider,
// Adds search-provider-specific information to omnibox event logs.
virtual void AddProviderInfo(ProvidersInfo* provider_info) const OVERRIDE;
- // content::URLFetcherDelegate
+ // net::URLFetcherDelegate
virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
// ID used in creating URLFetcher for default provider's suggest results.
@@ -220,7 +224,7 @@ class SearchProvider : public AutocompleteProvider,
// Creates a URLFetcher requesting suggest results from the specified
// |suggestions_url|. The caller owns the returned URLFetcher.
- content::URLFetcher* CreateSuggestFetcher(
+ net::URLFetcher* CreateSuggestFetcher(
int id,
const TemplateURLRef& suggestions_url,
const string16& text);
@@ -326,11 +330,11 @@ class SearchProvider : public AutocompleteProvider,
base::TimeTicks time_suggest_request_sent_;
// The fetcher that retrieves suggest results for the keyword from the server.
- scoped_ptr<content::URLFetcher> keyword_fetcher_;
+ scoped_ptr<net::URLFetcher> keyword_fetcher_;
// The fetcher that retrieves suggest results for the default engine from the
// server.
- scoped_ptr<content::URLFetcher> default_fetcher_;
+ scoped_ptr<net::URLFetcher> default_fetcher_;
// Suggestions returned by the Suggest server for the input text.
SuggestResults keyword_suggest_results_;