summaryrefslogtreecommitdiffstats
path: root/mojo/apps
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-22 14:20:55 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-22 14:20:55 +0000
commitf04b0e97b29c20ff2119a5e842f766b0e604b44d (patch)
tree28054151d219e77632f96e5499cc5c59957689af /mojo/apps
parentf269dc3c19468e46e36de8a7fd91ecd7f6de1f9d (diff)
downloadchromium_src-f04b0e97b29c20ff2119a5e842f766b0e604b44d.zip
chromium_src-f04b0e97b29c20ff2119a5e842f766b0e604b44d.tar.gz
chromium_src-f04b0e97b29c20ff2119a5e842f766b0e604b44d.tar.bz2
[gin] add support for non-gin managed isolates in gin.
BUG=317398 R=abarth@chromium.org,aa@chromium.org Review URL: https://codereview.chromium.org/82963002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@236766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/apps')
-rw-r--r--mojo/apps/js/main.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/apps/js/main.cc b/mojo/apps/js/main.cc
index 322c216..1ad084b 100644
--- a/mojo/apps/js/main.cc
+++ b/mojo/apps/js/main.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "gin/gin.h"
+#include "gin/public/isolate_holder.h"
#include "mojo/public/system/core_cpp.h"
#include "mojo/public/system/macros.h"
@@ -17,7 +17,7 @@
#endif
extern "C" MOJO_APPS_JS_EXPORT MojoResult CDECL MojoMain(MojoHandle pipe) {
- gin::Gin instance;
+ gin::IsolateHolder instance;
// TODO(abarth): Load JS off the network and execute it.
return MOJO_RESULT_OK;
}