Index: content/browser/loader/navigation_resource_handler.h |
diff --git a/content/browser/loader/sync_resource_handler.h b/content/browser/loader/navigation_resource_handler.h |
similarity index 53% |
copy from content/browser/loader/sync_resource_handler.h |
copy to content/browser/loader/navigation_resource_handler.h |
index bc26e4bd25cf2b8ced3db4f8a77a4734d7f3cf66..ff01d14280885f23e851115a60fb626f6c69ac33 100644 |
--- a/content/browser/loader/sync_resource_handler.h |
+++ b/content/browser/loader/navigation_resource_handler.h |
@@ -1,66 +1,68 @@ |
-// Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+// Copyright 2014 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
-#ifndef CONTENT_BROWSER_LOADER_SYNC_RESOURCE_HANDLER_H_ |
-#define CONTENT_BROWSER_LOADER_SYNC_RESOURCE_HANDLER_H_ |
- |
-#include <string> |
+#ifndef CONTENT_BROWSER_LOADER_NAVIGATION_RESOURCE_HANDLER_H_ |
+#define CONTENT_BROWSER_LOADER_NAVIGATION_RESOURCE_HANDLER_H_ |
+#include "base/macros.h" |
+#include "base/memory/ref_counted.h" |
#include "content/browser/loader/resource_handler.h" |
-#include "content/public/common/resource_response.h" |
- |
-namespace IPC { |
-class Message; |
-} |
- |
-namespace net { |
-class IOBuffer; |
-class URLRequest; |
-} |
+#include "content/browser/streams/stream_write_observer.h" |
namespace content { |
-class ResourceContext; |
-class ResourceDispatcherHostImpl; |
-class ResourceMessageFilter; |
-// Used to complete a synchronous resource request in response to resource load |
-// events from the resource dispatcher host. |
-class SyncResourceHandler : public ResourceHandler { |
+class NavigationURLLoaderCore; |
+class Stream; |
+ |
+// The leaf ResourceHandler used with NavigationURLLoaderCore. |
+class NavigationResourceHandler : public StreamWriteObserver, |
+ public ResourceHandler { |
public: |
- SyncResourceHandler(net::URLRequest* request, |
- IPC::Message* result_message, |
- ResourceDispatcherHostImpl* resource_dispatcher_host); |
- virtual ~SyncResourceHandler(); |
+ NavigationResourceHandler(net::URLRequest* request, |
+ NavigationURLLoaderCore* core); |
+ virtual ~NavigationResourceHandler(); |
+ void Cancel(); |
+ void Resume(); |
+ |
+ // ResourceHandler implementation. |
virtual bool OnUploadProgress(uint64 position, uint64 size) OVERRIDE; |
+ |
virtual bool OnRequestRedirected(const net::RedirectInfo& redirect_info, |
ResourceResponse* response, |
bool* defer) OVERRIDE; |
+ |
virtual bool OnResponseStarted(ResourceResponse* response, |
bool* defer) OVERRIDE; |
+ |
virtual bool OnWillStart(const GURL& url, bool* defer) OVERRIDE; |
+ |
virtual bool OnBeforeNetworkStart(const GURL& url, bool* defer) OVERRIDE; |
+ |
virtual bool OnWillRead(scoped_refptr<net::IOBuffer>* buf, |
int* buf_size, |
int min_size) OVERRIDE; |
+ |
virtual bool OnReadCompleted(int bytes_read, bool* defer) OVERRIDE; |
+ |
virtual void OnResponseCompleted(const net::URLRequestStatus& status, |
const std::string& security_info, |
bool* defer) OVERRIDE; |
+ |
virtual void OnDataDownloaded(int bytes_downloaded) OVERRIDE; |
private: |
- enum { kReadBufSize = 3840 }; |
+ // StreamWriteObserver implementation. |
+ virtual void OnSpaceAvailable(Stream* stream) OVERRIDE; |
+ virtual void OnClose(Stream* stream) OVERRIDE; |
+ scoped_refptr<NavigationURLLoaderCore> core_; |
+ scoped_refptr<Stream> stream_; |
scoped_refptr<net::IOBuffer> read_buffer_; |
- |
- SyncLoadResult result_; |
- IPC::Message* result_message_; |
- ResourceDispatcherHostImpl* rdh_; |
- int64 total_transfer_size_; |
+ DISALLOW_COPY_AND_ASSIGN(NavigationResourceHandler); |
}; |
} // namespace content |
-#endif // CONTENT_BROWSER_LOADER_SYNC_RESOURCE_HANDLER_H_ |
+#endif // CONTENT_BROWSER_LOADER_CERTIFICATE_RESOURCE_HANDLER_H_ |
clamy
2014/09/12 20:51:25
s/CERTIFICATE/NAVIGATION
davidben
2014/09/19 18:30:49
Done.
|