| Index: chrome/browser/chromeos/customization_document.h
|
| diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h
|
| index aef946c580d72a16ecab48cbd9e237b702d305a1..37bddd63a35d3ca34219ae2589c8de7867dc506e 100644
|
| --- a/chrome/browser/chromeos/customization_document.h
|
| +++ b/chrome/browser/chromeos/customization_document.h
|
| @@ -14,8 +14,8 @@
|
| #include "base/memory/singleton.h"
|
| #include "base/timer.h"
|
| #include "base/values.h"
|
| -#include "content/public/common/url_fetcher_delegate.h"
|
| #include "googleurl/src/gurl.h"
|
| +#include "net/url_request/url_fetcher_delegate.h"
|
|
|
| class FilePath;
|
| class PrefService;
|
| @@ -24,6 +24,10 @@ namespace base {
|
| class DictionaryValue;
|
| }
|
|
|
| +namespace net {
|
| +class URLFetcher;
|
| +}
|
| +
|
| namespace chromeos {
|
|
|
| namespace system {
|
| @@ -111,7 +115,7 @@ class StartupCustomizationDocument : public CustomizationDocument {
|
| // the manifest should be initiated outside this class by calling
|
| // StartFetching() method. User of the file should check IsReady before use it.
|
| class ServicesCustomizationDocument : public CustomizationDocument,
|
| - private content::URLFetcherDelegate {
|
| + private net::URLFetcherDelegate {
|
| public:
|
| static ServicesCustomizationDocument* GetInstance();
|
|
|
| @@ -148,7 +152,7 @@ class ServicesCustomizationDocument : public CustomizationDocument,
|
| // Save applied state in machine settings.
|
| static void SetApplied(bool val);
|
|
|
| - // Overriden from content::URLFetcherDelegate:
|
| + // Overriden from net::URLFetcherDelegate:
|
| virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
|
|
|
| // Initiate file fetching.
|
| @@ -161,7 +165,7 @@ class ServicesCustomizationDocument : public CustomizationDocument,
|
| GURL url_;
|
|
|
| // URLFetcher instance.
|
| - scoped_ptr<content::URLFetcher> url_fetcher_;
|
| + scoped_ptr<net::URLFetcher> url_fetcher_;
|
|
|
| // Timer to retry fetching file if network is not available.
|
| base::OneShotTimer<ServicesCustomizationDocument> retry_timer_;
|
|
|