| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 6b2c2cc5e26423b42bb2a5eeb21a5b9de4798897..35f250b0f40ad297e1da8a72733cc10a738160c6 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -28,6 +28,7 @@
|
| #include "content/child/web_socket_stream_handle_impl.h"
|
| #include "content/child/webmessageportchannel_impl.h"
|
| #include "content/child/websocket_bridge.h"
|
| +#include "content/child/weburlresponse_extradata_impl.h"
|
| #include "content/common/clipboard_messages.h"
|
| #include "content/common/frame_messages.h"
|
| #include "content/common/input_messages.h"
|
| @@ -109,7 +110,6 @@
|
| #include "third_party/WebKit/public/web/WebSurroundingText.h"
|
| #include "third_party/WebKit/public/web/WebUserGestureIndicator.h"
|
| #include "third_party/WebKit/public/web/WebView.h"
|
| -#include "webkit/child/weburlresponse_extradata_impl.h"
|
|
|
| #if defined(ENABLE_PLUGINS)
|
| #include "content/renderer/npapi/webplugin_impl.h"
|
| @@ -171,7 +171,6 @@ using blink::WebVector;
|
| using blink::WebView;
|
| using base::Time;
|
| using base::TimeDelta;
|
| -using webkit_glue::WebURLResponseExtraDataImpl;
|
|
|
| namespace content {
|
|
|
| @@ -1332,6 +1331,12 @@ ServiceRegistry* RenderFrameImpl::GetServiceRegistry() {
|
| return &service_registry_;
|
| }
|
|
|
| +bool RenderFrameImpl::IsFTPDirectoryListing(
|
| + const blink::WebURLResponse& response) {
|
| + WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response);
|
| + return extra_data ? extra_data->is_ftp_directory_listing() : false;
|
| +}
|
| +
|
| // blink::WebFrameClient implementation ----------------------------------------
|
|
|
| blink::WebPlugin* RenderFrameImpl::createPlugin(
|
| @@ -2534,8 +2539,7 @@ void RenderFrameImpl::didReceiveResponse(
|
| int http_status_code = response.httpStatusCode();
|
|
|
| // Record page load flags.
|
| - WebURLResponseExtraDataImpl* extra_data =
|
| - GetExtraDataFromResponse(response);
|
| + WebURLResponseExtraDataImpl* extra_data = GetExtraDataFromResponse(response);
|
| if (extra_data) {
|
| document_state->set_was_fetched_via_spdy(
|
| extra_data->was_fetched_via_spdy());
|
|
|