| Index: chrome/renderer/render_widget.cc
|
| ===================================================================
|
| --- chrome/renderer/render_widget.cc (revision 7623)
|
| +++ chrome/renderer/render_widget.cc (working copy)
|
| @@ -69,8 +69,7 @@
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| -RenderWidget::RenderWidget(RenderThreadBase* render_thread,
|
| - bool focus_on_show)
|
| +RenderWidget::RenderWidget(RenderThreadBase* render_thread, bool activatable)
|
| : routing_id_(MSG_ROUTING_NONE),
|
| opener_id_(MSG_ROUTING_NONE),
|
| render_thread_(render_thread),
|
| @@ -91,7 +90,7 @@
|
| ime_control_new_state_(false),
|
| ime_control_updated_(false),
|
| ime_control_busy_(false),
|
| - focus_on_show_(focus_on_show) {
|
| + activatable_(activatable) {
|
| RenderProcess::AddRefProcess();
|
| DCHECK(render_thread_);
|
| }
|
| @@ -111,10 +110,10 @@
|
| /*static*/
|
| RenderWidget* RenderWidget::Create(int32 opener_id,
|
| RenderThreadBase* render_thread,
|
| - bool focus_on_show) {
|
| + bool activatable) {
|
| DCHECK(opener_id != MSG_ROUTING_NONE);
|
| scoped_refptr<RenderWidget> widget = new RenderWidget(render_thread,
|
| - focus_on_show);
|
| + activatable);
|
| widget->Init(opener_id); // adds reference
|
| return widget;
|
| }
|
| @@ -130,7 +129,7 @@
|
| webwidget_.swap(&webwidget);
|
|
|
| bool result = render_thread_->Send(
|
| - new ViewHostMsg_CreateWidget(opener_id, focus_on_show_, &routing_id_));
|
| + new ViewHostMsg_CreateWidget(opener_id, activatable_, &routing_id_));
|
| if (result) {
|
| render_thread_->AddRoute(routing_id_, this);
|
| // Take a reference on behalf of the RenderThread. This will be balanced
|
|
|