Fix reversed focus traversal order issue.

views/focus/focus_manager_unittest.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.
 
 // Disabled right now as this won't work on BuildBots right now as this test
 // require the box it runs on to be unlocked (and no screen-savers).
 // The test actually simulates mouse and key events, so if the screen is locked,
 // the events don't go to the Chrome window.
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 874 matching lines @@
     }
   }
 
   // Focus the 1st item.
   GetFocusManager()->SetFocusedView(
       content_view_->GetViewByID(kTraversalIDs[0]));
 
   // Let's traverse in reverse order.
   for (int i = 0; i < 3; ++i) {
     for (int j = arraysize(kTraversalIDs) - 1; j >= 0; --j) {
-      // TODO(jcampan): Remove this hack.  The reverse order of traversal in
-      // Tabbed Panes is broken (we go to the tab before going to the content).
-      if (kTraversalIDs[j] == kStyleContainerID)
-        j--;  // Ignore the tab.
-
       GetFocusManager()->AdvanceFocus(true);
       View* focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
-
-      // TODO(jcampan): Remove this hack, same as above.
-      if (focused_view->GetID() == kStyleContainerID) {
-        j++;  // Ignore the tab.
-        continue;
-      }
-
       if (focused_view)
         EXPECT_EQ(kTraversalIDs[j], focused_view->GetID());
     }
   }
 }
 
 TEST_F(FocusTraversalTest, TraversalWithNonEnabledViews) {
   const int kDisabledIDs[] = {
       kBananaTextfieldID, kFruitCheckBoxID, kComboboxID, kAsparagusButtonID,
       kCauliflowerButtonID, kClosetLinkID, kVisitingLinkID, kBriceDeNiceLinkID,
@@ skipping 36 matching lines @@
   // Focus the 1st item.
   GetFocusManager()->AdvanceFocus(false);
   focused_view = GetFocusManager()->GetFocusedView();
   EXPECT_TRUE(focused_view != NULL);
   if (focused_view)
     EXPECT_EQ(kTraversalIDs[0], focused_view->GetID());
 
   // Same thing in reverse.
   for (int i = 0; i < 3; ++i) {
     for (int j = arraysize(kTraversalIDs) - 1; j >= 0; --j) {
-      // TODO(jcampan): Remove this hack.  The reverse order of traversal in
-      // Tabbed Panes is broken (we go to the tab before going to the content).
-      if (kTraversalIDs[j] == kStyleContainerID)
-        j--;  // Ignore the tab.
-
       GetFocusManager()->AdvanceFocus(true);
       focused_view = GetFocusManager()->GetFocusedView();
       EXPECT_TRUE(focused_view != NULL);
-
-      // TODO(jcampan): Remove this hack, same as above.
-      if (focused_view->GetID() == kStyleContainerID) {
-        j++;  // Ignore the tab.
-        continue;
-      }
-
       if (focused_view)
         EXPECT_EQ(kTraversalIDs[j], focused_view->GetID());
     }
   }
 }
 
 // Counts accelerator calls.
 class TestAcceleratorTarget : public AcceleratorTarget {
  public:
   explicit TestAcceleratorTarget(bool process_accelerator)
@@ skipping 149 matching lines @@
   EXPECT_EQ(target.accelerator_count(), 1);
   EXPECT_EQ(NULL,
             focus_manager->GetCurrentTargetForAccelerator(return_accelerator));
 
   // Hitting the return key again; nothing should happen.
   EXPECT_FALSE(focus_manager->ProcessAccelerator(return_accelerator));
   EXPECT_EQ(target.accelerator_count(), 1);
 }
 
 }  // namespace views