Index: chrome/browser/web_contents_view_win.cc |
=================================================================== |
--- chrome/browser/web_contents_view_win.cc (revision 7623) |
+++ chrome/browser/web_contents_view_win.cc (working copy) |
@@ -348,7 +348,7 @@ |
RenderWidgetHostView* WebContentsViewWin::CreateNewWidgetInternal( |
int route_id, |
- bool focus_on_show) { |
+ bool activatable) { |
// Create the widget and its associated view. |
// TODO(brettw) can widget creation be cross-platform? |
RenderWidgetHost* widget_host = |
@@ -364,7 +364,7 @@ |
widget_view->set_parent_hwnd( |
web_contents_->render_widget_host_view()->GetPluginHWND()); |
widget_view->set_close_on_deactivate(true); |
- widget_view->set_focus_on_show(focus_on_show); |
+ widget_view->set_activatable(activatable); |
return widget_view; |
} |
@@ -409,8 +409,8 @@ |
widget_host_view_win->MoveWindow(initial_pos.x(), initial_pos.y(), |
initial_pos.width(), initial_pos.height(), |
TRUE); |
- widget_host_view_win->ShowWindow(widget_host_view_win->focus_on_show() ? |
- SW_SHOW : SW_SHOWNOACTIVATE); |
+ widget_host_view_win->ShowWindow(widget_host_view_win->activatable() ? |
+ SW_SHOW : SW_SHOWNA); |
widget_host->Init(); |
} |