MacViews: Implement Full Keyboard Access.

ui/views/focus/focus_search.cc

 // Copyright (c) 2011 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 "base/logging.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/focus/focus_search.h"
 #include "ui/views/view.h"
+#include "ui/views/widget/widget.h"
 
 namespace views {
 
 FocusSearch::FocusSearch(View* root, bool cycle, bool accessibility_mode)
     : root_(root),
       cycle_(cycle),
       accessibility_mode_(accessibility_mode) {
+#if defined(OS_MACOSX)
+  // On Mac, only the keyboard accessibility mode defined in FocusManager is
+  // used. No special accessibility mode should be applicable for a
+  // FocusTraversable.
+  accessibility_mode_ = false;
+#endif
 }
 
 View* FocusSearch::FindNextFocusableView(View* starting_view,
                                          bool reverse,
                                          Direction direction,
                                          bool check_starting_view,
                                          FocusTraversable** focus_traversable,
                                          View** focus_traversable_view) {
   *focus_traversable = NULL;
   *focus_traversable_view = NULL;
@@ skipping 66 matching lines @@
   return NULL;
 }
 
 bool FocusSearch::IsViewFocusableCandidate(View* v, int skip_group_id) {
   return IsFocusable(v) &&
       (v->IsGroupFocusTraversable() || skip_group_id == -1 ||
        v->GetGroup() != skip_group_id);
 }
 
 bool FocusSearch::IsFocusable(View* v) {
-  if (accessibility_mode_)
+  DCHECK(root_);
+  // Sanity Check. Currently the FocusManager keyboard accessibility mode is
+  // only used on Mac, for which |accessibility_mode_| is false.
+  DCHECK(!(accessibility_mode_ &&
+           root_->GetWidget()->GetFocusManager()->keyboard_accessible()));
+  if (accessibility_mode_ ||
+      root_->GetWidget()->GetFocusManager()->keyboard_accessible())
     return v && v->IsAccessibilityFocusable();
   return v && v->IsFocusable();
 }
 
 View* FocusSearch::FindSelectedViewForGroup(View* view) {
   if (view->IsGroupFocusTraversable() ||
       view->GetGroup() == -1)  // No group for that view.
     return view;
 
   View* selected_view = view->GetSelectedViewForGroup(view->GetGroup());
@@ skipping 153 matching lines @@
                                            skip_group_id,
                                            focus_traversable,
                                            focus_traversable_view);
   }
 
   // We found nothing.
   return NULL;
 }
 
 }  // namespace views