From 6ec7b8da05d21a3878bd21c691b41e675d74bb1c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 17 Jul 2017 13:57:45 +0200 Subject: BASELINE: Update Chromium to 60.0.3112.70 Change-Id: I9911c2280a014d4632f254857876a395d4baed2d Reviewed-by: Alexandru Croitor --- .../dom_distiller/content/browser/dom_distiller_viewer_source.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'chromium/components/dom_distiller/content/browser/dom_distiller_viewer_source.h') diff --git a/chromium/components/dom_distiller/content/browser/dom_distiller_viewer_source.h b/chromium/components/dom_distiller/content/browser/dom_distiller_viewer_source.h index 2ed7a3f19df..6b91b1ed9ea 100644 --- a/chromium/components/dom_distiller/content/browser/dom_distiller_viewer_source.h +++ b/chromium/components/dom_distiller/content/browser/dom_distiller_viewer_source.h @@ -35,9 +35,9 @@ class DomDistillerViewerSource : public content::URLDataSource { const content::ResourceRequestInfo::WebContentsGetter& wc_getter, const content::URLDataSource::GotDataCallback& callback) override; std::string GetMimeType(const std::string& path) const override; - bool ShouldServiceRequest(const net::URLRequest* request) const override; - void WillServiceRequest(const net::URLRequest* request, - std::string* path) const override; + bool ShouldServiceRequest(const GURL& url, + content::ResourceContext* resource_context, + int render_process_id) const override; std::string GetContentSecurityPolicyStyleSrc() const override; std::string GetContentSecurityPolicyChildSrc() const override; -- cgit v1.2.1