Merge 26135 - The focus is not restored properly when a Windows modal dialog...

views/widget/widget_win.h

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef VIEWS_WIDGET_WIDGET_WIN_H_
 #define VIEWS_WIDGET_WIDGET_WIN_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
 #include <atlcrack.h>
@@ skipping 615 matching lines @@
   // deliver them. Displaying a window may result in the system generating
   // duplicate move events even though the mouse hasn't moved.
 
   // If true, the last event was a mouse move event.
   bool last_mouse_event_was_move_;
 
   // Coordinates of the last mouse move event, in screen coordinates.
   int last_mouse_move_x_;
   int last_mouse_move_y_;
 
+  // Whether the focus should be restored next time we get enabled.  Needed to
+  // restore focus correctly when Windows modal dialogs are displayed.
+  bool restore_focus_when_enabled_;
+
   // Instance of accessibility information and handling for MSAA root
   CComPtr<IAccessible> accessibility_root_;
 
   scoped_ptr<DefaultThemeProvider> default_theme_provider_;
 
   // Our hwnd.
   HWND hwnd_;
 };
 
 }  // namespace views
 
 #endif  // #ifndef VIEWS_WIDGET_WIDGET_WIN_H_