mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Move resource_response.h to //services/network/public/cpp.

Browse source 
https://chromium-review.googlesource.com/865664
This commit is contained in:
Aleksei Kuzmin 2018-04-11 12:45:42 +02:00 committed by Samuel Attard
parent 1a11bb936b
commit 576bf8f6c0
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
atom/browser/loader/layered_resource_handler.cc
View file

@ -16,7 +16,7 @@ LayeredResourceHandler::LayeredResourceHandler(
LayeredResourceHandler::~LayeredResourceHandler() {} LayeredResourceHandler::~LayeredResourceHandler() {}
void LayeredResourceHandler::OnResponseStarted( void LayeredResourceHandler::OnResponseStarted(
content::ResourceResponse* response, network::ResourceResponse* response,
std::unique_ptr<content::ResourceController> controller) { std::unique_ptr<content::ResourceController> controller) {
if (delegate_) if (delegate_)
delegate_->OnResponseStarted(response); delegate_->OnResponseStarted(response);

5
atom/browser/loader/layered_resource_handler.h
View file

@ -6,6 +6,7 @@
#define ATOM_BROWSER_LOADER_LAYERED_RESOURCE_HANDLER_H_ #define ATOM_BROWSER_LOADER_LAYERED_RESOURCE_HANDLER_H_
#include "content/browser/loader/layered_resource_handler.h" #include "content/browser/loader/layered_resource_handler.h"
#include "services/network/public/cpp/resource_response.h"
namespace atom { namespace atom {
@ -17,7 +18,7 @@ class LayeredResourceHandler : public content::LayeredResourceHandler {
Delegate() {} Delegate() {}
virtual ~Delegate() {} virtual ~Delegate() {}
virtual void OnResponseStarted(content::ResourceResponse* response) = 0; virtual void OnResponseStarted(network::ResourceResponse* response) = 0;
}; };
LayeredResourceHandler(net::URLRequest* request, LayeredResourceHandler(net::URLRequest* request,
@ -27,7 +28,7 @@ class LayeredResourceHandler : public content::LayeredResourceHandler {
// content::LayeredResourceHandler: // content::LayeredResourceHandler:
void OnResponseStarted( void OnResponseStarted(
content::ResourceResponse* response, network::ResourceResponse* response,
std::unique_ptr<content::ResourceController> controller) override; std::unique_ptr<content::ResourceController> controller) override;
private: private:

3
atom/browser/ui/webui/pdf_viewer_ui.cc
View file

@ -32,6 +32,7 @@
#include "net/base/mime_util.h" #include "net/base/mime_util.h"
#include "net/url_request/url_request.h" #include "net/url_request/url_request.h"
#include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context.h"
#include "services/network/public/cpp/resource_response.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
using content::BrowserThread; using content::BrowserThread;
@ -169,7 +170,7 @@ class PdfViewerUI::ResourceRequester
protected: protected:
// atom::LayeredResourceHandler::Delegate: // atom::LayeredResourceHandler::Delegate:
void OnResponseStarted(content::ResourceResponse* response) override { void OnResponseStarted(network::ResourceResponse* response) override {
DCHECK_CURRENTLY_ON(BrowserThread::IO); DCHECK_CURRENTLY_ON(BrowserThread::IO);
auto resource_response_head = response->head; auto resource_response_head = response->head;