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

Unified Diff: extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc

Issue 2399463007: AssociatedURLLoader shouldn't derive from WebURLLoader (Closed)
Patch Set: Rebase Created 4 years, 2 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
Index: extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
diff --git a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
index 85e283390d39d78dd847c081b093afccb7660186..c0a68448bfe7a437c0bb28295f81c0da8179aabe 100644
--- a/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
+++ b/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.cc
@@ -22,6 +22,8 @@
#include "gin/interceptor.h"
#include "gin/object_template_builder.h"
#include "gin/wrappable.h"
+#include "third_party/WebKit/public/web/WebAssociatedURLLoader.h"
+#include "third_party/WebKit/public/web/WebAssociatedURLLoaderOptions.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "third_party/WebKit/public/web/WebRemoteFrame.h"
@@ -145,11 +147,11 @@ void MimeHandlerViewContainer::OnReady() {
return;
blink::WebFrame* frame = render_frame()->GetWebFrame();
- blink::WebURLLoaderOptions options;
+ blink::WebAssociatedURLLoaderOptions options;
// The embedded plugin is allowed to be cross-origin and we should always
// send credentials/cookies with the request.
options.crossOriginRequestPolicy =
- blink::WebURLLoaderOptions::CrossOriginRequestPolicyAllow;
+ blink::WebAssociatedURLLoaderOptions::CrossOriginRequestPolicyAllow;
options.allowCredentials = true;
DCHECK(!loader_);
loader_.reset(frame->createAssociatedURLLoader(options));
@@ -204,18 +206,12 @@ v8::Local<v8::Object> MimeHandlerViewContainer::V8ScriptableObject(
return v8::Local<v8::Object>::New(isolate, scriptable_object_);
}
-void MimeHandlerViewContainer::didReceiveData(blink::WebURLLoader* /* unused */,
- const char* data,
- int data_length,
- int /* unused */,
- int /* unused */) {
+void MimeHandlerViewContainer::didReceiveData(const char* data,
+ int data_length) {
view_id_ += std::string(data, data_length);
}
-void MimeHandlerViewContainer::didFinishLoading(
- blink::WebURLLoader* /* unused */,
- double /* unused */,
- int64_t /* unused */) {
+void MimeHandlerViewContainer::didFinishLoading(double /* unused */) {
DCHECK(is_embedded_);
CreateMimeHandlerViewGuest();
}
« no previous file with comments | « extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h ('k') | media/blink/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698