Fixes focus traversal bug

ui/views/focus/focus_manager.cc

 // Copyright (c) 2012 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.
 
 #include "ui/views/focus/focus_manager.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/auto_reset.h"
@@ skipping 121 matching lines @@
 }
 
 // Tests whether a view is valid, whether it still belongs to the window
 // hierarchy of the FocusManager.
 bool FocusManager::ContainsView(View* view) {
   Widget* widget = view->GetWidget();
   return widget ? widget->GetFocusManager() == this : false;
 }
 
 void FocusManager::AdvanceFocus(bool reverse) {
-  View* v = GetNextFocusableView(focused_view_, reverse, false);
+  View* v = GetNextFocusableView(focused_view_, NULL, reverse, false);
   // Note: Do not skip this next block when v == focused_view_.  If the user
   // tabs past the last focusable element in a webpage, we'll get here, and if
   // the TabContentsContainerView is the only focusable view (possible in
   // fullscreen mode), we need to run this block in order to cycle around to the
   // first element on the page.
   if (v) {
     views::View* focused_view = focused_view_;
     v->AboutToRequestFocusFromTabTraversal(reverse);
     // AboutToRequestFocusFromTabTraversal() may have changed focus. If it did,
     // don't change focus again.
@@ skipping 59 matching lines @@
     pane->RequestFocus();
     focused_view = GetFocusedView();
     if (pane == focused_view || pane->Contains(focused_view))
       return true;
   }
 
   return false;
 }
 
 View* FocusManager::GetNextFocusableView(View* original_starting_view,
+                                         Widget* starting_widget,
                                          bool reverse,
                                          bool dont_loop) {
   FocusTraversable* focus_traversable = NULL;
 
   // Let's revalidate the focused view.
   ValidateFocusedView();
 
   View* starting_view = NULL;
   if (original_starting_view) {
     // Search up the containment hierarchy to see if a view is acting as
@@ skipping 23 matching lines @@
         }
       } else {
         // When you are going back, starting view's FocusTraversable
         // should not be used.
         focus_traversable =
             original_starting_view->GetWidget()->GetFocusTraversable();
         starting_view = original_starting_view;
       }
     }
   } else {
-    focus_traversable = widget_->GetFocusTraversable();
+    Widget* widget = starting_widget ? starting_widget : widget_;
+    focus_traversable = widget->GetFocusTraversable();
   }
 
   // Traverse the FocusTraversable tree down to find the focusable view.
   View* v = FindFocusableView(focus_traversable, starting_view, reverse);
   if (v) {
     return v;
   } else {
     // Let's go up in the FocusTraversable tree.
     FocusTraversable* parent_focus_traversable =
         focus_traversable->GetFocusTraversableParent();
@@ skipping 20 matching lines @@
       starting_view = focus_traversable->GetFocusTraversableParentView();
       parent_focus_traversable =
           parent_focus_traversable->GetFocusTraversableParent();
     }
 
     // If we get here, we have reached the end of the focus hierarchy, let's
     // loop. Make sure there was at least a view to start with, to prevent
     // infinitely looping in empty windows.
     if (!dont_loop && original_starting_view) {
       // Easy, just clear the selection and press tab again.
-      // By calling with NULL as the starting view, we'll start from the
-      // top_root_view.
-      return GetNextFocusableView(NULL, reverse, true);
+      // By calling with NULL as the starting view, we'll start from either
+      // the starting views widget or |widget_|.
+      Widget* widget = original_starting_view->GetWidget();
+      if (widget->widget_delegate()->ShouldAdvanceFocusToTopLevelWidget())
+        widget = widget_;
+      return GetNextFocusableView(NULL, widget, reverse, true);
     }
   }
   return NULL;
 }
 
 void FocusManager::SetFocusedViewWithReason(
     View* view, FocusChangeReason reason) {
   if (focused_view_ == view)
     return;
 
@@ skipping 216 matching lines @@
   }
   if (key_code == ui::VKEY_RIGHT || key_code == ui::VKEY_DOWN) {
     AdvanceFocus(false);
     return true;
   }
 
   return false;
 }
 
 }  // namespace views