Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1768)

Unified Diff: content/renderer/render_frame_impl.cc

Issue 394403002: Move weburlresponse_extradata_impl.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_frame_impl.cc
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 2feffd810fcfd5d79ee95e711430de5d8c649290..edf4c359a721751121dbacf3e87b59a86320ac45 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 {
@@ -1349,6 +1348,12 @@ ServiceRegistry* RenderFrameImpl::GetServiceRegistry() {
return &service_registry_;
}
+bool RenderFrameImpl::IsFTPDirectoryListing() {
+ WebURLResponseExtraDataImpl* extra_data =
+ GetExtraDataFromResponse(frame_->dataSource()->response());
+ return extra_data ? extra_data->is_ftp_directory_listing() : false;
+}
+
// blink::WebFrameClient implementation ----------------------------------------
blink::WebPlugin* RenderFrameImpl::createPlugin(
@@ -2552,8 +2557,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());
« no previous file with comments | « content/renderer/render_frame_impl.h ('k') | content/renderer/render_view_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698