diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 23:43:21 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-11 23:43:21 +0000 |
commit | c1afdb9074ac86f73799723cbbbd87b062bcb9de (patch) | |
tree | 714de2700e5c5dd5f02bbea39e994045fbcb3f80 | |
parent | 169a2c94b7962fa8ae2a3236d4f68c2492ab871d (diff) | |
download | chromium_src-c1afdb9074ac86f73799723cbbbd87b062bcb9de.zip chromium_src-c1afdb9074ac86f73799723cbbbd87b062bcb9de.tar.gz chromium_src-c1afdb9074ac86f73799723cbbbd87b062bcb9de.tar.bz2 |
net: Add namespace net to URLRequestAboutJob.
BUG=64263
TEST=trybots
Review URL: http://codereview.chromium.org/5797003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68950 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | chrome/browser/chromeos/login/account_screen_browsertest.cc | 2 | ||||
-rw-r--r-- | chrome/browser/chromeos/login/registration_screen.cc | 2 | ||||
-rw-r--r-- | net/url_request/url_request_about_job.cc | 12 | ||||
-rw-r--r-- | net/url_request/url_request_about_job.h | 10 | ||||
-rw-r--r-- | net/url_request/url_request_job_manager.cc | 2 |
5 files changed, 18 insertions, 10 deletions
diff --git a/chrome/browser/chromeos/login/account_screen_browsertest.cc b/chrome/browser/chromeos/login/account_screen_browsertest.cc index 0e3a2d7..309d8bc 100644 --- a/chrome/browser/chromeos/login/account_screen_browsertest.cc +++ b/chrome/browser/chromeos/login/account_screen_browsertest.cc @@ -74,7 +74,7 @@ static net::URLRequestJob* InspectorHook(net::URLRequest* request, NewRunnableFunction(QuitUIMessageLoop)); // Do not navigate to the given URL. Navigate to about:blank instead. - return new URLRequestAboutJob(request); + return new net::URLRequestAboutJob(request); } // Sometimes times out: http://crbug.com/60050. diff --git a/chrome/browser/chromeos/login/registration_screen.cc b/chrome/browser/chromeos/login/registration_screen.cc index dbc2e68..2cc4325 100644 --- a/chrome/browser/chromeos/login/registration_screen.cc +++ b/chrome/browser/chromeos/login/registration_screen.cc @@ -145,7 +145,7 @@ void RegistrationScreen::CloseScreen(ScreenObserver::ExitCodes code) { net::URLRequestJob* RegistrationScreen::Factory(net::URLRequest* request, const std::string& scheme) { VLOG(1) << "Handling url: " << request->url().spec().c_str(); - return new URLRequestAboutJob(request); + return new net::URLRequestAboutJob(request); } } // namespace chromeos diff --git a/net/url_request/url_request_about_job.cc b/net/url_request/url_request_about_job.cc index 51cd9bf..b8dab1a 100644 --- a/net/url_request/url_request_about_job.cc +++ b/net/url_request/url_request_about_job.cc @@ -10,14 +10,16 @@ #include "base/message_loop.h" +namespace net { + // static -net::URLRequestJob* URLRequestAboutJob::Factory(net::URLRequest* request, - const std::string& scheme) { +URLRequestJob* URLRequestAboutJob::Factory(URLRequest* request, + const std::string& scheme) { return new URLRequestAboutJob(request); } -URLRequestAboutJob::URLRequestAboutJob(net::URLRequest* request) - : net::URLRequestJob(request) { +URLRequestAboutJob::URLRequestAboutJob(URLRequest* request) + : URLRequestJob(request) { } void URLRequestAboutJob::Start() { @@ -38,3 +40,5 @@ URLRequestAboutJob::~URLRequestAboutJob() { void URLRequestAboutJob::StartAsync() { NotifyHeadersComplete(); } + +} // namespace net diff --git a/net/url_request/url_request_about_job.h b/net/url_request/url_request_about_job.h index cd1d372..7617208 100644 --- a/net/url_request/url_request_about_job.h +++ b/net/url_request/url_request_about_job.h @@ -11,14 +11,16 @@ #include "net/url_request/url_request.h" #include "net/url_request/url_request_job.h" -class URLRequestAboutJob : public net::URLRequestJob { +namespace net { + +class URLRequestAboutJob : public URLRequestJob { public: - explicit URLRequestAboutJob(net::URLRequest* request); + explicit URLRequestAboutJob(URLRequest* request); virtual void Start(); virtual bool GetMimeType(std::string* mime_type) const; - static net::URLRequest::ProtocolFactory Factory; + static URLRequest::ProtocolFactory Factory; private: ~URLRequestAboutJob(); @@ -26,4 +28,6 @@ class URLRequestAboutJob : public net::URLRequestJob { void StartAsync(); }; +} // namespace net + #endif // NET_URL_REQUEST_URL_REQUEST_ABOUT_JOB_H_ diff --git a/net/url_request/url_request_job_manager.cc b/net/url_request/url_request_job_manager.cc index 914be05..72a2426 100644 --- a/net/url_request/url_request_job_manager.cc +++ b/net/url_request/url_request_job_manager.cc @@ -33,7 +33,7 @@ static const SchemeToFactory kBuiltinFactories[] = { { "https", URLRequestHttpJob::Factory }, { "file", URLRequestFileJob::Factory }, { "ftp", URLRequestFtpJob::Factory }, - { "about", URLRequestAboutJob::Factory }, + { "about", net::URLRequestAboutJob::Factory }, { "data", URLRequestDataJob::Factory }, }; |