Landing Marshall Greenblatt change.

See review at:
http://codereview.chromium.org/609010/show

BUG=None
TEST=None


Review URL: http://codereview.chromium.org/657019

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39827 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 33 insertions, 4 deletions

diff --git a/views/widget/widget_win.cc b/views/widget/widget_win.cc
index ea54036..8a97b34 100644
--- a/views/widget/widget_win.cc
+++ b/views/widget/widget_win.cc
@@ -67,6 +67,31 @@ WidgetWin* WidgetWin::GetWidget(HWND hwnd) {
   return reinterpret_cast<WidgetWin*>(win_util::GetWindowUserData(hwnd));
 }
 
+// static
+WidgetWin* WidgetWin::GetRootWidget(HWND hwnd) {
+  // First, check if the top-level window is a Widget.
+  HWND root = ::GetAncestor(hwnd, GA_ROOT);
+  if (!root)
+    return NULL;
+
+  WidgetWin* widget = WidgetWin::GetWidget(root);
+  if (widget)
+    return widget;
+
+  // Second, try to locate the last Widget window in the parent hierarchy.
+  HWND parent_hwnd = hwnd;
+  WidgetWin* parent_widget;
+  do {
+    parent_widget = WidgetWin::GetWidget(parent_hwnd);
+    if (parent_widget) {
+      widget = parent_widget;
+      parent_hwnd = ::GetAncestor(parent_hwnd, GA_PARENT);
+    }
+  } while (parent_hwnd != NULL && parent_widget != NULL);
+
+  return widget;
+}
+
 void WidgetWin::SetUseLayeredBuffer(bool use_layered_buffer) {
   if (use_layered_buffer_ == use_layered_buffer)
     return;
@@ -103,8 +128,10 @@ void WidgetWin::Init(gfx::NativeView parent, const gfx::Rect& bounds) {
 
   drop_target_ = new DropTargetWin(root_view_.get());
 
-  if ((window_style() & WS_CHILD) == 0) {
-    // Top-level widgets get a FocusManager.
+  if ((window_style() & WS_CHILD) == 0 ||
+      WidgetWin::GetRootWidget(parent) == NULL) {
+    // Top-level widgets and child widgets who do not have a top-level widget
+    // ancestor get a FocusManager.
     focus_manager_.reset(new FocusManager(this));
   }
 
@@ -296,8 +323,7 @@ RootView* WidgetWin::GetRootView() {
 }
 
 Widget* WidgetWin::GetRootWidget() const {
-  return reinterpret_cast<WidgetWin*>(
-      win_util::GetWindowUserData(GetAncestor(hwnd(), GA_ROOT)));
+  return GetRootWidget(hwnd());
 }
 
 bool WidgetWin::IsVisible() const {
diff --git a/views/widget/widget_win.h b/views/widget/widget_win.h
index ed233d4..b8246da 100644
--- a/views/widget/widget_win.h
+++ b/views/widget/widget_win.h
@@ -76,6 +76,9 @@ class WidgetWin : public app::WindowImpl,
   // Returns the Widget associated with the specified HWND (if any).
   static WidgetWin* GetWidget(HWND hwnd);
 
+  // Returns the root Widget associated with the specified HWND (if any).
+  static WidgetWin* GetRootWidget(HWND hwnd);
+
   void set_delete_on_destroy(bool delete_on_destroy) {
     delete_on_destroy_ = delete_on_destroy;
   }