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

Side by Side Diff: trunk/src/content/renderer/mojo/mojo_render_process_observer.cc

Issue 208263008: Revert 258763 "Adds plumbing to pass WebUI mojo::Handle from bro..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/mojo/mojo_render_process_observer.h" 5 #include "content/renderer/mojo/mojo_render_process_observer.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "content/child/child_process.h" 8 #include "content/child/child_process.h"
9 #include "content/common/mojo/mojo_channel_init.h" 9 #include "content/common/mojo/mojo_channel_init.h"
10 #include "content/common/mojo/mojo_messages.h" 10 #include "content/common/mojo/mojo_messages.h"
11 #include "content/public/renderer/render_thread.h" 11 #include "content/public/renderer/render_thread.h"
12 #include "content/public/renderer/render_view.h"
13 #include "content/renderer/web_ui_mojo.h"
14 12
15 namespace content { 13 namespace content {
16 14
17 MojoRenderProcessObserver::MojoRenderProcessObserver( 15 MojoRenderProcessObserver::MojoRenderProcessObserver(
18 RenderThread* render_thread) 16 RenderThread* render_thread)
19 : render_thread_(render_thread) { 17 : render_thread_(render_thread) {
20 render_thread_->AddObserver(this); 18 render_thread_->AddObserver(this);
21 } 19 }
22 20
23 bool MojoRenderProcessObserver::OnControlMessageReceived( 21 bool MojoRenderProcessObserver::OnControlMessageReceived(
(...skipping 17 matching lines...) Expand all
41 void MojoRenderProcessObserver::OnChannelCreated( 39 void MojoRenderProcessObserver::OnChannelCreated(
42 const IPC::PlatformFileForTransit& file) { 40 const IPC::PlatformFileForTransit& file) {
43 #if defined(OS_POSIX) 41 #if defined(OS_POSIX)
44 base::PlatformFile handle = file.fd; 42 base::PlatformFile handle = file.fd;
45 #elif defined(OS_WIN) 43 #elif defined(OS_WIN)
46 base::PlatformFile handle = file; 44 base::PlatformFile handle = file;
47 #endif 45 #endif
48 DCHECK(!channel_init_.get()); 46 DCHECK(!channel_init_.get());
49 channel_init_.reset(new MojoChannelInit); 47 channel_init_.reset(new MojoChannelInit);
50 channel_init_->Init(handle, ChildProcess::current()->io_message_loop_proxy()); 48 channel_init_->Init(handle, ChildProcess::current()->io_message_loop_proxy());
51 if (!channel_init_->is_handle_valid())
52 return;
53
54 ScopedRenderProcessHostMojoHandle render_process_host_handle(
55 RenderProcessHostMojoHandle(
56 channel_init_->bootstrap_message_pipe().release().value()));
57 render_process_host_mojo_.reset(render_process_host_handle.Pass(), this);
58 }
59
60 void MojoRenderProcessObserver::SetWebUIHandle(
61 int32 view_routing_id,
62 mojo::ScopedMessagePipeHandle web_ui_handle) {
63 RenderView* render_view = RenderView::FromRoutingID(view_routing_id);
64 if (!render_view)
65 return;
66 WebUIMojo* web_ui_mojo = WebUIMojo::Get(render_view);
67 if (!web_ui_mojo)
68 return;
69 web_ui_mojo->SetBrowserHandle(web_ui_handle.Pass());
70 } 49 }
71 50
72 } // namespace content 51 } // namespace content
OLDNEW
« no previous file with comments | « trunk/src/content/renderer/mojo/mojo_render_process_observer.h ('k') | trunk/src/content/renderer/render_view_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698