summaryrefslogtreecommitdiffstats
path: root/ui/views/accessible_pane_view_unittest.cc
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-15 01:13:48 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-15 01:13:48 +0000
commit51af8ea54802137b938fdc59e2be7bee58049b38 (patch)
tree7a89184a1c1a2a84af1a6d01ca3b7ccbc933a9f3 /ui/views/accessible_pane_view_unittest.cc
parentd7cc394e346982f4bd360612f60cabc806b099ae (diff)
downloadchromium_src-51af8ea54802137b938fdc59e2be7bee58049b38.zip
chromium_src-51af8ea54802137b938fdc59e2be7bee58049b38.tar.gz
chromium_src-51af8ea54802137b938fdc59e2be7bee58049b38.tar.bz2
This restores a hack that was in place in the old NativeTabContentsContainer code that seemed to clear focus during restoration (though the hack was for another purpose, the hack seemed to fix this bug too). I've isolated the hack to the re-activation code.
http://crbug.com/125976 TEST=see bug Review URL: https://chromiumcodereview.appspot.com/10378043 Review URL: https://chromiumcodereview.appspot.com/10378043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137040 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/accessible_pane_view_unittest.cc')
-rw-r--r--ui/views/accessible_pane_view_unittest.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/views/accessible_pane_view_unittest.cc b/ui/views/accessible_pane_view_unittest.cc
index 467f143..f7551d6 100644
--- a/ui/views/accessible_pane_view_unittest.cc
+++ b/ui/views/accessible_pane_view_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
@@ -84,6 +84,7 @@ TEST_F(AccessiblePaneViewTest, SimpleSetPaneFocus) {
View* root = widget->GetRootView();
root->AddChildView(test_view);
widget->Show();
+ widget->Activate();
// Set pane focus succeeds, focus on child.
EXPECT_TRUE(test_view->SetPaneFocusAndFocusDefault());
@@ -113,6 +114,7 @@ TEST_F(AccessiblePaneViewTest, TwoSetPaneFocus) {
root->AddChildView(test_view);
root->AddChildView(test_view_2);
widget->Show();
+ widget->Activate();
// Set pane focus succeeds, focus on child.
EXPECT_TRUE(test_view->SetPaneFocusAndFocusDefault());
@@ -142,6 +144,7 @@ TEST_F(AccessiblePaneViewTest, PaneFocusTraversal) {
root->AddChildView(original_test_view);
root->AddChildView(test_view);
widget->Show();
+ widget->Activate();
// Set pane focus on first view.
EXPECT_TRUE(original_test_view->SetPaneFocus(