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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: trunk/src/content/renderer/web_ui_mojo.cc

Issue 352013002: Revert 279557 "Support exposing Mojo services between render fra..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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 | « trunk/src/content/renderer/render_thread_impl.cc ('k') | trunk/src/content/renderer/web_ui_setup_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/content/renderer/web_ui_mojo.cc
===================================================================
--- trunk/src/content/renderer/web_ui_mojo.cc (revision 279559)
+++ trunk/src/content/renderer/web_ui_mojo.cc (working copy)
@@ -5,7 +5,6 @@
#include "content/renderer/web_ui_mojo.h"
#include "content/common/view_messages.h"
-#include "content/public/common/service_registry.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "content/renderer/web_ui_mojo_context_state.h"
@@ -85,11 +84,8 @@
void WebUIMojo::OnDidFinishDocumentLoad() {
did_finish_document_load_ = true;
- mojo::MessagePipe pipe;
- SetHandleOnContextState(pipe.handle0.Pass());
- RenderFrame::FromWebFrame(render_view()->GetWebView()->mainFrame())->
- GetServiceRegistry()->
- GetRemoteInterface("webui_controller", pipe.handle1.Pass());
+ if (pending_handle_.is_valid())
+ SetHandleOnContextState(pending_handle_.Pass());
}
void WebUIMojo::SetHandleOnContextState(mojo::ScopedMessagePipeHandle handle) {
« no previous file with comments | « trunk/src/content/renderer/render_thread_impl.cc ('k') | trunk/src/content/renderer/web_ui_setup_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698