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

Unified Diff: services/js/js_app.cc

Issue 868463008: Remove Client relationship between mojo.Shell/mojo.Application (Closed) Base URL: git@github.com:domokit/mojo.git@app_impl_init
Patch Set: fix android Created 5 years, 11 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: services/js/js_app.cc
diff --git a/services/js/js_app.cc b/services/js/js_app.cc
index 0eeaf3673075dc2d146f4f65732cafc021d4622e..ada7d20e35a1da4dac4125bab2aefccde324ed5d 100644
--- a/services/js/js_app.cc
+++ b/services/js/js_app.cc
@@ -20,8 +20,9 @@ namespace js {
const char JSApp::kMainModuleName[] = "main";
-JSApp::JSApp(mojo::ShellPtr shell, mojo::URLResponsePtr response)
- : shell_(shell.Pass()) {
+JSApp::JSApp(mojo::InterfaceRequest<mojo::Application> application_request,
+ mojo::URLResponsePtr response)
+ : application_request_(application_request.Pass()) {
v8::Isolate* isolate = isolate_holder_.isolate();
message_loop_observers_.reset(new JSAppMessageLoopObservers(isolate));
@@ -52,9 +53,9 @@ void JSApp::OnAppLoaded(std::string url, v8::Handle<v8::Value> main_module) {
v8::Isolate* isolate = isolate_holder_.isolate();
v8::Handle<v8::Value> argv[] = {
- gin::ConvertToV8(isolate, shell_.PassMessagePipe().release()),
- gin::ConvertToV8(isolate, url)
- };
+ gin::ConvertToV8(isolate,
+ application_request_.PassMessagePipe().release()),
+ gin::ConvertToV8(isolate, url)};
v8::Handle<v8::Function> app_class;
CHECK(gin::ConvertFromV8(isolate, main_module, &app_class));

Powered by Google App Engine
This is Rietveld 408576698