From 3e46363ae19011718c5d4941239a164eda7167bf Mon Sep 17 00:00:00 2001 From: Cheng Zhao Date: Mon, 1 Sep 2014 15:36:37 +0800 Subject: [PATCH] Fix API changes of Chrome 37. --- atom/browser/atom_browser_context.cc | 13 +++++++------ atom/browser/atom_browser_context.h | 2 +- atom/renderer/atom_render_view_observer.h | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/atom/browser/atom_browser_context.cc b/atom/browser/atom_browser_context.cc index bcd10ed6b7dc..d3b40fe1ef99 100644 --- a/atom/browser/atom_browser_context.cc +++ b/atom/browser/atom_browser_context.cc @@ -13,7 +13,8 @@ #include "content/public/common/url_constants.h" #include "net/url_request/data_protocol_handler.h" #include "net/url_request/file_protocol_handler.h" -#include "net/url_request/protocol_intercept_job_factory.h" +#include "net/url_request/url_request_intercepting_job_factory.h" +#include "url/url_constants.h" using content::BrowserThread; @@ -29,7 +30,7 @@ AtomBrowserContext::~AtomBrowserContext() { net::URLRequestJobFactory* AtomBrowserContext::CreateURLRequestJobFactory( content::ProtocolHandlerMap* handlers, - content::ProtocolHandlerScopedVector* interceptors) { + content::URLRequestInterceptorScopedVector* interceptors) { scoped_ptr job_factory(job_factory_); for (content::ProtocolHandlerMap::iterator it = handlers->begin(); @@ -38,18 +39,18 @@ net::URLRequestJobFactory* AtomBrowserContext::CreateURLRequestJobFactory( handlers->clear(); job_factory->SetProtocolHandler( - content::kDataScheme, new net::DataProtocolHandler); + url::kDataScheme, new net::DataProtocolHandler); job_factory->SetProtocolHandler( - content::kFileScheme, new net::FileProtocolHandler( + url::kFileScheme, new net::FileProtocolHandler( BrowserThread::GetBlockingPool()->GetTaskRunnerWithShutdownBehavior( base::SequencedWorkerPool::SKIP_ON_SHUTDOWN))); // Set up interceptors in the reverse order. scoped_ptr top_job_factory = job_factory.PassAs(); - content::ProtocolHandlerScopedVector::reverse_iterator it; + content::URLRequestInterceptorScopedVector::reverse_iterator it; for (it = interceptors->rbegin(); it != interceptors->rend(); ++it) - top_job_factory.reset(new net::ProtocolInterceptJobFactory( + top_job_factory.reset(new net::URLRequestInterceptingJobFactory( top_job_factory.Pass(), make_scoped_ptr(*it))); interceptors->weak_clear(); diff --git a/atom/browser/atom_browser_context.h b/atom/browser/atom_browser_context.h index 06860937460f..95db71ff6997 100644 --- a/atom/browser/atom_browser_context.h +++ b/atom/browser/atom_browser_context.h @@ -27,7 +27,7 @@ class AtomBrowserContext : public brightray::BrowserContext { // brightray::URLRequestContextGetter::Delegate: virtual net::URLRequestJobFactory* CreateURLRequestJobFactory( content::ProtocolHandlerMap* handlers, - content::ProtocolHandlerScopedVector* interceptors) OVERRIDE; + content::URLRequestInterceptorScopedVector* interceptors) OVERRIDE; private: // A fake BrowserProcess object that used to feed the source code from chrome. diff --git a/atom/renderer/atom_render_view_observer.h b/atom/renderer/atom_render_view_observer.h index 1e1f356f02f6..6a6dbb5ed8bf 100644 --- a/atom/renderer/atom_render_view_observer.h +++ b/atom/renderer/atom_render_view_observer.h @@ -5,6 +5,7 @@ #ifndef ATOM_RENDERER_ATOM_RENDER_VIEW_OBSERVER_H_ #define ATOM_RENDERER_ATOM_RENDER_VIEW_OBSERVER_H_ +#include "base/strings/string16.h" #include "content/public/renderer/render_view_observer.h" namespace base {