diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 10:18:59 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 10:18:59 +0000 |
| commit | 9acd869ec5621373757a6959310f39e1f5ec3f3d (patch) | |
| tree | 43b9beab430d066670b7515579e20c755d9a0d4d /chrome/browser/dom_ui | |
| parent | 3f45597ed0041c49a627fd5e2be55ff6d5570022 (diff) | |
| download | chromium_src-9acd869ec5621373757a6959310f39e1f5ec3f3d.zip chromium_src-9acd869ec5621373757a6959310f39e1f5ec3f3d.tar.gz chromium_src-9acd869ec5621373757a6959310f39e1f5ec3f3d.tar.bz2 | |
net: Remove typedef net::URLRequestJob URLRequestJob;
BUG=64263
TEST=compiled locally, trybots
Review URL: http://codereview.chromium.org/5607004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68935 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/dom_ui')
| -rw-r--r-- | chrome/browser/dom_ui/chrome_url_data_manager.cc | 16 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/mediaplayer_ui.cc | 4 | ||||
| -rw-r--r-- | chrome/browser/dom_ui/mediaplayer_ui.h | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/dom_ui/chrome_url_data_manager.cc b/chrome/browser/dom_ui/chrome_url_data_manager.cc index 6153458..adfb744 100644 --- a/chrome/browser/dom_ui/chrome_url_data_manager.cc +++ b/chrome/browser/dom_ui/chrome_url_data_manager.cc @@ -34,15 +34,15 @@ #include "net/url_request/url_request_file_job.h" #include "net/url_request/url_request_job.h" -// URLRequestChromeJob is a URLRequestJob that manages running chrome-internal -// resource requests asynchronously. +// URLRequestChromeJob is a net::URLRequestJob that manages running +// chrome-internal resource requests asynchronously. // It hands off URL requests to ChromeURLDataManager, which asynchronously // calls back once the data is available. class URLRequestChromeJob : public net::URLRequestJob { public: explicit URLRequestChromeJob(net::URLRequest* request); - // URLRequestJob implementation. + // net::URLRequestJob implementation. virtual void Start(); virtual void Kill(); virtual bool ReadRawData(net::IOBuffer* buf, int buf_size, int *bytes_read); @@ -60,7 +60,7 @@ class URLRequestChromeJob : public net::URLRequestJob { virtual ~URLRequestChromeJob(); // Helper for Start(), to let us start asynchronously. - // (This pattern is shared by most URLRequestJob implementations.) + // (This pattern is shared by most net::URLRequestJob implementations.) void StartAsync(); // Do the actual copy from data_ (the data we're serving) into |buf|. @@ -82,7 +82,7 @@ class URLRequestChromeJob : public net::URLRequestJob { DISALLOW_COPY_AND_ASSIGN(URLRequestChromeJob); }; -// URLRequestChromeFileJob is a URLRequestJob that acts like a file:// URL +// URLRequestChromeFileJob is a net::URLRequestJob that acts like a file:// URL class URLRequestChromeFileJob : public URLRequestFileJob { public: URLRequestChromeFileJob(net::URLRequest* request, const FilePath& path); @@ -322,8 +322,8 @@ void ChromeURLDataManager::DataSource::SetFontAndTextDirection( base::i18n::IsRTL() ? "rtl" : "ltr"); } -URLRequestJob* ChromeURLDataManager::Factory(net::URLRequest* request, - const std::string& scheme) { +net::URLRequestJob* ChromeURLDataManager::Factory(net::URLRequest* request, + const std::string& scheme) { // Try first with a file handler FilePath path; if (ChromeURLDataManager::URLToFilePath(request->url(), &path)) @@ -346,7 +346,7 @@ URLRequestJob* ChromeURLDataManager::Factory(net::URLRequest* request, } URLRequestChromeJob::URLRequestChromeJob(net::URLRequest* request) - : URLRequestJob(request), + : net::URLRequestJob(request), data_offset_(0), pending_buf_size_(0) { } diff --git a/chrome/browser/dom_ui/mediaplayer_ui.cc b/chrome/browser/dom_ui/mediaplayer_ui.cc index 3119e534..f69ebcd 100644 --- a/chrome/browser/dom_ui/mediaplayer_ui.cc +++ b/chrome/browser/dom_ui/mediaplayer_ui.cc @@ -543,7 +543,7 @@ void MediaPlayer::PopupMediaPlayer(Browser* creator) { mediaplayer_browser_->window()->Show(); } -URLRequestJob* MediaPlayer::MaybeIntercept(net::URLRequest* request) { +net::URLRequestJob* MediaPlayer::MaybeIntercept(net::URLRequest* request) { // Don't attempt to intercept here as we want to wait until the mime // type is fully determined. return NULL; @@ -557,7 +557,7 @@ static const char* const supported_mime_type_list[] = { "audio/mp3" }; -URLRequestJob* MediaPlayer::MaybeInterceptResponse( +net::URLRequestJob* MediaPlayer::MaybeInterceptResponse( net::URLRequest* request) { // Do not intercept this request if it is a download. if (request->load_flags() & net::LOAD_IS_DOWNLOAD) { diff --git a/chrome/browser/dom_ui/mediaplayer_ui.h b/chrome/browser/dom_ui/mediaplayer_ui.h index ec198b2..c7168ee 100644 --- a/chrome/browser/dom_ui/mediaplayer_ui.h +++ b/chrome/browser/dom_ui/mediaplayer_ui.h @@ -78,7 +78,7 @@ class MediaPlayer : public NotificationObserver, virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request); // Determines if the requested document can be viewed by the - // MediaPlayer. If it can, returns a URLRequestJob that + // MediaPlayer. If it can, returns a net::URLRequestJob that // redirects the browser to the view URL. // Implementation of net::URLRequest::Interceptor. virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request); |