| Index: content/renderer/render_widget_fullscreen.cc
|
| diff --git a/content/renderer/render_widget_fullscreen.cc b/content/renderer/render_widget_fullscreen.cc
|
| index 00d53724db95d739b2ad28cd6e5a725db3514247..b754c1d67bee1f97307d72def276d0d611967d01 100644
|
| --- a/content/renderer/render_widget_fullscreen.cc
|
| +++ b/content/renderer/render_widget_fullscreen.cc
|
| @@ -41,26 +41,19 @@ WebWidget* RenderWidgetFullscreen::CreateWebWidget() {
|
| return RenderWidget::CreateWebWidget(this);
|
| }
|
|
|
| -bool RenderWidgetFullscreen::SendIPC(int32_t opener_id, int32_t* routing_id) {
|
| - return RenderThread::Get()->Send(
|
| - new ViewHostMsg_CreateFullscreenWidget(opener_id, routing_id));
|
| -}
|
| -
|
| bool RenderWidgetFullscreen::Init(int32_t opener_id) {
|
| DCHECK(!GetWebWidget());
|
|
|
| - bool success = RenderWidget::DoInit(
|
| - opener_id, CreateWebWidget(),
|
| - base::Bind(&RenderWidgetFullscreen::SendIPC, base::Unretained(this),
|
| - opener_id, &routing_id_));
|
| + // Synchronous IPC to obtain a routing id for ourselves.
|
| + int32_t routing_id = MSG_ROUTING_NONE;
|
| + RenderThread::Get()->Send(
|
| + new ViewHostMsg_CreateFullscreenWidget(opener_id, &routing_id));
|
|
|
| - if (success) {
|
| - // TODO(fsamuel): This is a bit ugly. The |create_widget_message| should
|
| - // probably be factored out of RenderWidget::DoInit.
|
| - SetRoutingID(routing_id_);
|
| - return true;
|
| - }
|
| - return false;
|
| + if (routing_id == MSG_ROUTING_NONE)
|
| + return false;
|
| +
|
| + RenderWidget::Init(routing_id, opener_id, CreateWebWidget());
|
| + return true;
|
| }
|
|
|
| } // namespace content
|
|
|