MacViews: Implement Full Keyboard Access.

ui/views/focus/focus_manager_unittest.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 <stddef.h>
 
 #include <utility>
 #include <vector>
@@ skipping 766 matching lines @@
   EXPECT_EQ(v[1], focus_manager->GetFocusedView());
   focus_manager->OnKeyEvent(left_key);
   EXPECT_EQ(v[0], focus_manager->GetFocusedView());
   focus_manager->OnKeyEvent(down_key);
   EXPECT_EQ(v[1], focus_manager->GetFocusedView());
   focus_manager->OnKeyEvent(up_key);
   EXPECT_EQ(v[0], focus_manager->GetFocusedView());
 }
 
 TEST_F(FocusManagerTest, StoreFocusedView) {
-  View view;
-  GetFocusManager()->SetFocusedView(&view);
+  View* view = new View;
+  // Add view to the view hierarchy and make it focusable.
+  GetWidget()->GetRootView()->AddChildView(view);
+  view->SetFocusable(true);
+
+  GetFocusManager()->SetFocusedView(view);
   GetFocusManager()->StoreFocusedView(false);
   EXPECT_EQ(NULL, GetFocusManager()->GetFocusedView());
   EXPECT_TRUE(GetFocusManager()->RestoreFocusedView());
-  EXPECT_EQ(&view, GetFocusManager()->GetStoredFocusView());
+  EXPECT_EQ(view, GetFocusManager()->GetStoredFocusView());
 
   // Repeat with |true|.
-  GetFocusManager()->SetFocusedView(&view);
+  GetFocusManager()->SetFocusedView(view);
   GetFocusManager()->StoreFocusedView(true);
   EXPECT_EQ(NULL, GetFocusManager()->GetFocusedView());
   EXPECT_TRUE(GetFocusManager()->RestoreFocusedView());
-  EXPECT_EQ(&view, GetFocusManager()->GetStoredFocusView());
+  EXPECT_EQ(view, GetFocusManager()->GetStoredFocusView());
 }
 
 namespace {
 
 // Trivial WidgetDelegate implementation that allows setting return value of
 // ShouldAdvanceFocusToTopLevelWidget().
 class AdvanceFocusWidgetDelegate : public WidgetDelegate {
  public:
   explicit AdvanceFocusWidgetDelegate(Widget* widget)
       : widget_(widget),
@@ skipping 64 matching lines @@
   EXPECT_EQ(view1, GetFocusManager()->GetFocusedView());
 
   // Allow focus to go to the parent, and focus backwards which should now move
   // up |widget_view| (in the parent).
   delegate->set_should_advance_focus_to_parent(true);
   GetFocusManager()->AdvanceFocus(true);
   EXPECT_EQ(widget_view, GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views