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

Unified Diff: mojo/apps/js/content_handler_impl.cc

Issue 638293005: ContentHandler::OnConnect: replace the |url| param with |requestor_url|. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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: mojo/apps/js/content_handler_impl.cc
diff --git a/mojo/apps/js/content_handler_impl.cc b/mojo/apps/js/content_handler_impl.cc
index f3dffa7e824191685c4f50c87dbf4d41839817b9..01897a0b7a1692fa2be96d5522994e7d325d20dd 100644
--- a/mojo/apps/js/content_handler_impl.cc
+++ b/mojo/apps/js/content_handler_impl.cc
@@ -14,22 +14,19 @@ namespace apps {
class ContentHandlerJSApp : public JSApp {
public:
ContentHandlerJSApp(ApplicationDelegateImpl* app_delegate_impl,
- const std::string& url,
URLResponsePtr content)
: JSApp(app_delegate_impl),
- url_(url),
content_(content.Pass()) {
}
virtual bool Load(std::string* source, std::string* file_name) override {
- *file_name = url_;
+ *file_name = content_->url;
if (content_.is_null())
return false;
return common::BlockingCopyToString(content_->body.Pass(), source);
}
private:
- std::string url_;
URLResponsePtr content_;
};
@@ -42,13 +39,11 @@ ContentHandlerImpl::~ContentHandlerImpl() {
}
void ContentHandlerImpl::OnConnect(
- const mojo::String& url,
+ const mojo::String& requestor_url,
URLResponsePtr content,
InterfaceRequest<ServiceProvider> service_provider) {
scoped_ptr<JSApp> js_app(
- new ContentHandlerJSApp(app_delegate_impl_,
- url.To<std::string>(),
- content.Pass()));
+ new ContentHandlerJSApp(app_delegate_impl_, content.Pass()));
app_delegate_impl_->StartJSApp(js_app.Pass());
}
« no previous file with comments | « mojo/application_manager/application_manager.cc ('k') | mojo/examples/content_handler_demo/content_handler_demo.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698