Fix reversed focus traversal order issue.

views/focus/focus_manager.cc

 // 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.
 
 #include "views/focus/focus_manager.h"
 
 #include <algorithm>
 
 #include "build/build_config.h"
 
@@ skipping 342 matching lines @@
 View* FocusManager::GetNextFocusableView(View* original_starting_view,
                                          bool reverse,
                                          bool dont_loop) {
   FocusTraversable* focus_traversable = NULL;
 
   // Let's revalidate the focused view.
   ValidateFocusedView();
 
   View* starting_view = NULL;
   if (original_starting_view) {
-    // If the starting view has a focus traversable, use it.
-    // This is the case with WidgetWins for example.
-    focus_traversable = original_starting_view->GetFocusTraversable();
+    if (!reverse) {
+      // If the starting view has a focus traversable, use it.
+      // This is the case with WidgetWins for example.
+      focus_traversable = original_starting_view->GetFocusTraversable();
 
-    // Otherwise default to the root view.
-    if (!focus_traversable) {
+      // Otherwise default to the root view.
+      if (!focus_traversable) {
+        focus_traversable = original_starting_view->GetRootView();
+        starting_view = original_starting_view;
+      }
+    } else {
+      // When you are going back, starting view's FocusTraversable should not be
+      // used.
       focus_traversable = original_starting_view->GetRootView();
       starting_view = original_starting_view;
     }
   } else {
     focus_traversable = top_root_view_;
   }
 
   // Traverse the FocusTraversable tree down to find the focusable view.
-  View* v = FindFocusableView(focus_traversable, starting_view,
-                              reverse, dont_loop);
+  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();
     starting_view = focus_traversable->GetFocusTraversableParentView();
     while (parent_focus_traversable) {
       FocusTraversable* new_focus_traversable = NULL;
       View* new_starting_view = NULL;
-      v = parent_focus_traversable ->FindNextFocusableView(
-          starting_view, reverse, FocusTraversable::UP, dont_loop,
-          &new_focus_traversable, &new_starting_view);
+      // When we are going backward, the parent view might gain the next focus.
+      bool check_starting_view = reverse;
+      v = parent_focus_traversable->FindNextFocusableView(
+          starting_view, reverse, FocusTraversable::UP,
+          check_starting_view, &new_focus_traversable, &new_starting_view);
 
       if (new_focus_traversable) {
         DCHECK(!v);
 
         // There is a FocusTraversable, traverse it down.
-        v = FindFocusableView(new_focus_traversable, NULL, reverse, dont_loop);
+        v = FindFocusableView(new_focus_traversable, NULL, reverse);
       }
 
       if (v)
         return v;
 
       starting_view = focus_traversable->GetFocusTraversableParentView();
       parent_focus_traversable =
           parent_focus_traversable->GetFocusTraversableParent();
     }
 
@@ skipping 148 matching lines @@
     return NULL;
 
   return GetFocusManager(parent);
 }
 
 // Find the next (previous if reverse is true) focusable view for the specified
 // FocusTraversable, starting at the specified view, traversing down the
 // FocusTraversable hierarchy.
 View* FocusManager::FindFocusableView(FocusTraversable* focus_traversable,
                                       View* starting_view,
-                                      bool reverse,
-                                      bool dont_loop) {
+                                      bool reverse) {
   FocusTraversable* new_focus_traversable = NULL;
   View* new_starting_view = NULL;
   View* v = focus_traversable->FindNextFocusableView(starting_view,
                                                      reverse,
                                                      FocusTraversable::DOWN,
-                                                     dont_loop,
+                                                     false,
                                                      &new_focus_traversable,
                                                      &new_starting_view);
 
   // Let's go down the FocusTraversable tree as much as we can.
   while (new_focus_traversable) {
     DCHECK(!v);
     focus_traversable = new_focus_traversable;
     starting_view = new_starting_view;
     new_focus_traversable = NULL;
     starting_view = NULL;
     v = focus_traversable->FindNextFocusableView(starting_view,
                                                  reverse,
                                                  FocusTraversable::DOWN,
-                                                 dont_loop,
+                                                 false,
                                                  &new_focus_traversable,
                                                  &new_starting_view);
   }
   return v;
 }
 
 void FocusManager::RegisterAccelerator(
     const Accelerator& accelerator,
     AcceleratorTarget* target) {
   AcceleratorTargetList& targets = accelerators_[accelerator];
@@ skipping 105 matching lines @@
       std::find(focus_change_listeners_.begin(), focus_change_listeners_.end(),
                 listener);
   if (place == focus_change_listeners_.end()) {
     NOTREACHED() << "Removing a listener that isn't registered.";
     return;
   }
   focus_change_listeners_.erase(place);
 }
 
 }  // namespace views