| Index: chrome/browser/alternate_nav_url_fetcher.h
|
| diff --git a/chrome/browser/alternate_nav_url_fetcher.h b/chrome/browser/alternate_nav_url_fetcher.h
|
| index e9467f026d9e6fa44b13c6fd690ddb12f8fbbc62..6e2755ea8cdacc6b26f06727e6c9f9da9c8cdcaf 100644
|
| --- a/chrome/browser/alternate_nav_url_fetcher.h
|
| +++ b/chrome/browser/alternate_nav_url_fetcher.h
|
| @@ -11,14 +11,15 @@
|
| #include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| -#include "content/public/common/url_fetcher_delegate.h"
|
| #include "googleurl/src/gurl.h"
|
| +#include "net/url_request/url_fetcher_delegate.h"
|
|
|
| namespace content {
|
| class NavigationController;
|
| }
|
|
|
| namespace net {
|
| +class URLFetcher;
|
| class URLRequestStatus;
|
| }
|
|
|
| @@ -39,7 +40,7 @@ class URLRequestStatus;
|
| // * The intranet fetch fails
|
| // * None of the above apply, so we successfully show an infobar
|
| class AlternateNavURLFetcher : public content::NotificationObserver,
|
| - public content::URLFetcherDelegate {
|
| + public net::URLFetcherDelegate {
|
| public:
|
| enum State {
|
| NOT_STARTED,
|
| @@ -59,7 +60,7 @@ class AlternateNavURLFetcher : public content::NotificationObserver,
|
| const content::NotificationSource& source,
|
| const content::NotificationDetails& details) OVERRIDE;
|
|
|
| - // content::URLFetcherDelegate
|
| + // net::URLFetcherDelegate
|
| virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
|
|
|
| // Sets |controller_| to the supplied pointer and begins fetching
|
| @@ -79,7 +80,7 @@ class AlternateNavURLFetcher : public content::NotificationObserver,
|
| void ShowInfobarIfPossible();
|
|
|
| GURL alternate_nav_url_;
|
| - scoped_ptr<content::URLFetcher> fetcher_;
|
| + scoped_ptr<net::URLFetcher> fetcher_;
|
| content::NavigationController* controller_;
|
| State state_;
|
| bool navigated_to_entry_;
|
|
|