Tab-modal dialog improvements:...

chrome/browser/views/constrained_window_win.cc

Index: chrome/browser/views/constrained_window_win.cc
===================================================================
--- chrome/browser/views/constrained_window_win.cc	(revision 36364)
+++ chrome/browser/views/constrained_window_win.cc	(working copy)
@@ -592,6 +592,16 @@
   return new ConstrainedWindowFrameView(this);
 }
 
+void ConstrainedWindowWin::FocusConstrainedWindow() {
+  focused_view_->RequestFocus();
+}
+
+void ConstrainedWindowWin::ShowConstrainedWindow() {
+  ActivateConstrainedWindow();
+  FocusConstrainedWindow();
+}
+
+
 void ConstrainedWindowWin::CloseConstrainedWindow() {
   // Broadcast to all observers of NOTIFY_CWINDOW_CLOSED.
   // One example of such an observer is AutomationCWindowTracker in the
@@ -632,7 +642,9 @@
   set_focus_on_creation(false);
 
   WindowWin::Init(owner_->GetNativeView(), gfx::Rect());
-  ActivateConstrainedWindow();
+
+  focused_view_ = window_delegate->GetContentsView();
+  DCHECK(focused_view_);
 }
 
 void ConstrainedWindowWin::ActivateConstrainedWindow() {