Index: mojo/services/html_viewer/weburlloader_impl.h |
diff --git a/mojo/services/html_viewer/weburlloader_impl.h b/mojo/services/html_viewer/weburlloader_impl.h |
index fd4070d47b51a6a95e78fc77157ce1f4a5ff74a2..ecfe6c08b35f33fc946506caa20a96a237ac7a6c 100644 |
--- a/mojo/services/html_viewer/weburlloader_impl.h |
+++ b/mojo/services/html_viewer/weburlloader_impl.h |
@@ -14,6 +14,9 @@ |
namespace mojo { |
class NetworkService; |
+} |
+ |
+namespace html_viewer { |
// The concrete type of WebURLRequest::ExtraData. |
class WebURLRequestExtraData : public blink::WebURLRequest::ExtraData { |
@@ -21,12 +24,12 @@ class WebURLRequestExtraData : public blink::WebURLRequest::ExtraData { |
WebURLRequestExtraData(); |
virtual ~WebURLRequestExtraData(); |
- URLResponsePtr synthetic_response; |
+ mojo::URLResponsePtr synthetic_response; |
}; |
class WebURLLoaderImpl : public blink::WebURLLoader { |
public: |
- explicit WebURLLoaderImpl(NetworkService* network_service); |
+ explicit WebURLLoaderImpl(mojo::NetworkService* network_service); |
private: |
virtual ~WebURLLoaderImpl(); |
@@ -40,24 +43,24 @@ class WebURLLoaderImpl : public blink::WebURLLoader { |
virtual void cancel() override; |
virtual void setDefersLoading(bool defers_loading) override; |
- void OnReceivedResponse(URLResponsePtr response); |
- void OnReceivedError(URLResponsePtr response); |
- void OnReceivedRedirect(URLResponsePtr response); |
+ void OnReceivedResponse(mojo::URLResponsePtr response); |
+ void OnReceivedError(mojo::URLResponsePtr response); |
+ void OnReceivedRedirect(mojo::URLResponsePtr response); |
void ReadMore(); |
void WaitToReadMore(); |
void OnResponseBodyStreamReady(MojoResult result); |
blink::WebURLLoaderClient* client_; |
GURL url_; |
- URLLoaderPtr url_loader_; |
- ScopedDataPipeConsumerHandle response_body_stream_; |
- common::HandleWatcher handle_watcher_; |
+ mojo::URLLoaderPtr url_loader_; |
+ mojo::ScopedDataPipeConsumerHandle response_body_stream_; |
+ mojo::common::HandleWatcher handle_watcher_; |
base::WeakPtrFactory<WebURLLoaderImpl> weak_factory_; |
DISALLOW_COPY_AND_ASSIGN(WebURLLoaderImpl); |
}; |
-} // namespace mojo |
+} // namespace html_viewer |
#endif // MOJO_SERVICES_HTML_VIEWER_WEBURLLOADER_IMPL_H_ |