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

Unified Diff: content/renderer/web_ui_mojo_context_state.cc

Issue 206923002: Adds plumbing to pass WebUI mojo::Handle from browser to renderer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add TODO and merge to trunk Created 6 years, 9 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 | « content/renderer/web_ui_mojo_context_state.h ('k') | content/test/data/web_ui_mojo.html » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/web_ui_mojo_context_state.cc
diff --git a/content/renderer/web_ui_mojo_context_state.cc b/content/renderer/web_ui_mojo_context_state.cc
index 0c8ab24e8ce53eb7639ac0383373f672d30c8682..71ffe79ee4acb4475370ada3d87b31cdf19f87ea 100644
--- a/content/renderer/web_ui_mojo_context_state.cc
+++ b/content/renderer/web_ui_mojo_context_state.cc
@@ -35,7 +35,7 @@ namespace {
const char kModulePrefix[] = "chrome://mojo/";
void RunMain(base::WeakPtr<gin::Runner> runner,
- mojo::ScopedHandle* handle,
+ mojo::ScopedMessagePipeHandle* handle,
v8::Handle<v8::Value> module) {
v8::Isolate* isolate = runner->GetContextHolder()->isolate();
v8::Handle<v8::Function> start;
@@ -70,9 +70,10 @@ WebUIMojoContextState::~WebUIMojoContextState() {
runner_->GetContextHolder()->context())->RemoveObserver(this);
}
-void WebUIMojoContextState::SetHandle(mojo::ScopedHandle handle) {
+void WebUIMojoContextState::SetHandle(mojo::ScopedMessagePipeHandle handle) {
gin::ContextHolder* context_holder = runner_->GetContextHolder();
- mojo::ScopedHandle* passed_handle = new mojo::ScopedHandle(handle.Pass());
+ mojo::ScopedMessagePipeHandle* passed_handle =
+ new mojo::ScopedMessagePipeHandle(handle.Pass());
gin::ModuleRegistry::From(context_holder->context())->LoadModule(
context_holder->isolate(),
"main",
« no previous file with comments | « content/renderer/web_ui_mojo_context_state.h ('k') | content/test/data/web_ui_mojo.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698