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

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

Issue 90203002: [Mojo] Remove static "bootstrap" state in mojo_js (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: CHECK, CHECK, CHECK Created 7 years, 1 month 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 | « mojo/apps/js/threading.h ('k') | mojo/mojo.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/apps/js/threading.cc
diff --git a/mojo/apps/js/bootstrap.cc b/mojo/apps/js/threading.cc
similarity index 64%
rename from mojo/apps/js/bootstrap.cc
rename to mojo/apps/js/threading.cc
index 540309f98bdcf28165664ab7cc6b32021c433873..09536cd25b1be981d15bf01037f38e623db43c0c 100644
--- a/mojo/apps/js/bootstrap.cc
+++ b/mojo/apps/js/threading.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 "mojo/apps/js/bootstrap.h"
+#include "mojo/apps/js/threading.h"
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
@@ -19,15 +19,13 @@ void Quit() {
base::MessageLoop::current()->QuitNow();
}
-MojoHandle g_initial_handle = MOJO_HANDLE_INVALID;
-
gin::WrapperInfo g_wrapper_info = { gin::kEmbedderNativeGin };
} // namespace
-const char Bootstrap::kModuleName[] = "mojo/apps/js/bootstrap";
+const char Threading::kModuleName[] = "mojo/apps/js/threading";
-v8::Local<v8::ObjectTemplate> Bootstrap::GetTemplate(v8::Isolate* isolate) {
+v8::Local<v8::ObjectTemplate> Threading::GetTemplate(v8::Isolate* isolate) {
gin::PerIsolateData* data = gin::PerIsolateData::From(isolate);
v8::Local<v8::ObjectTemplate> templ = data->GetObjectTemplate(
&g_wrapper_info);
@@ -36,21 +34,11 @@ v8::Local<v8::ObjectTemplate> Bootstrap::GetTemplate(v8::Isolate* isolate) {
templ = v8::ObjectTemplate::New();
templ->Set(gin::StringToSymbol(isolate, "quit"),
gin::CreateFunctionTemplate(isolate, base::Bind(Quit)));
-
- // Don't forget to call SetInitialHandle before getting the template.
- DCHECK(g_initial_handle != MOJO_HANDLE_INVALID);
- templ->Set(gin::StringToSymbol(isolate, "initialHandle"),
- gin::ConvertToV8(isolate, g_initial_handle));
-
data->SetObjectTemplate(&g_wrapper_info, templ);
}
return templ;
}
-void Bootstrap::SetInitialHandle(MojoHandle pipe) {
- g_initial_handle = pipe;
-}
-
} // namespace apps
} // namespace mojo
« no previous file with comments | « mojo/apps/js/threading.h ('k') | mojo/mojo.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698