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

Unified Diff: services/js/content_handler_main.cc

Issue 2011383002: Get rid of {Run,Terminate}MainApplication(), and more ApplicationDelegate conversion. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 4 years, 7 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 | « services/icu_data/main.cc ('k') | services/keyboard/linux/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/js/content_handler_main.cc
diff --git a/services/js/content_handler_main.cc b/services/js/content_handler_main.cc
index 79eb6c5ebf8b36a1672b5b4506875fb77eb66f4a..dfd1610f2aee961bdced04664f78ea64ccbba33c 100644
--- a/services/js/content_handler_main.cc
+++ b/services/js/content_handler_main.cc
@@ -6,6 +6,7 @@
#include "gin/array_buffer.h"
#include "gin/public/isolate_holder.h"
#include "mojo/application/content_handler_factory.h"
+#include "mojo/environment/scoped_chromium_init.h"
#include "mojo/public/c/system/main.h"
#include "mojo/public/cpp/application/application_impl_base.h"
#include "mojo/public/cpp/application/run_application.h"
@@ -51,6 +52,7 @@ class JsContentHandler : public mojo::ApplicationImplBase,
} // namespace js
MojoResult MojoMain(MojoHandle application_request) {
+ mojo::ScopedChromiumInit init;
js::JsContentHandler js_content_handler;
- return mojo::RunMainApplication(application_request, &js_content_handler);
+ return mojo::RunApplication(application_request, &js_content_handler);
}
« no previous file with comments | « services/icu_data/main.cc ('k') | services/keyboard/linux/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698