diff options
Diffstat (limited to 'chrome/browser/chromeos/imageburner')
-rw-r--r-- | chrome/browser/chromeos/imageburner/burn_manager.cc | 4 | ||||
-rw-r--r-- | chrome/browser/chromeos/imageburner/burn_manager.h | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/chrome/browser/chromeos/imageburner/burn_manager.cc b/chrome/browser/chromeos/imageburner/burn_manager.cc index 5b0a61d..775a2e0 100644 --- a/chrome/browser/chromeos/imageburner/burn_manager.cc +++ b/chrome/browser/chromeos/imageburner/burn_manager.cc @@ -282,7 +282,7 @@ void BurnManager::FetchConfigFile(Delegate* delegate) { return; config_fetcher_.reset(content::URLFetcher::Create( - config_file_url_, content::URLFetcher::GET, this)); + config_file_url_, net::URLFetcher::GET, this)); config_fetcher_->SetRequestContext( g_browser_process->system_request_context()); config_fetcher_->Start(); @@ -292,7 +292,7 @@ void BurnManager::FetchImage(const GURL& image_url, const FilePath& file_path) { tick_image_download_start_ = base::TimeTicks::Now(); bytes_image_download_progress_last_reported_ = 0; image_fetcher_.reset(content::URLFetcher::Create(image_url, - content::URLFetcher::GET, + net::URLFetcher::GET, this)); image_fetcher_->SetRequestContext( g_browser_process->system_request_context()); diff --git a/chrome/browser/chromeos/imageburner/burn_manager.h b/chrome/browser/chromeos/imageburner/burn_manager.h index 8b79979..cebed12 100644 --- a/chrome/browser/chromeos/imageburner/burn_manager.h +++ b/chrome/browser/chromeos/imageburner/burn_manager.h @@ -15,8 +15,12 @@ #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" #include "base/time.h" -#include "content/public/common/url_fetcher_delegate.h" #include "googleurl/src/gurl.h" +#include "net/url_request/url_fetcher_delegate.h" + +namespace net { +class URLFetcher; +} // namespace net namespace chromeos { namespace imageburner { @@ -154,7 +158,7 @@ class StateMachine { DISALLOW_COPY_AND_ASSIGN(StateMachine); }; -class BurnManager : content::URLFetcherDelegate { +class BurnManager : net::URLFetcherDelegate { public: class Delegate : public base::SupportsWeakPtr<Delegate> { @@ -252,8 +256,8 @@ class BurnManager : content::URLFetcherDelegate { scoped_ptr<StateMachine> state_machine_; - scoped_ptr<content::URLFetcher> config_fetcher_; - scoped_ptr<content::URLFetcher> image_fetcher_; + scoped_ptr<net::URLFetcher> config_fetcher_; + scoped_ptr<net::URLFetcher> image_fetcher_; base::TimeTicks tick_image_download_start_; int64 bytes_image_download_progress_last_reported_; |