summaryrefslogtreecommitdiffstats
path: root/ui/views/accessible_pane_view_unittest.cc
diff options
context:
space:
mode:
authorbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-15 16:48:14 +0000
committerbeng@google.com <beng@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-15 16:48:14 +0000
commit3c8cd81992440ed81a862ac7b18c2fe4f6180a9b (patch)
tree1fc6a23f91c6ad354db00a3e77c9592e6abebd45 /ui/views/accessible_pane_view_unittest.cc
parent62da82b0b9555d89b9e63815e658f8f654aadf13 (diff)
downloadchromium_src-3c8cd81992440ed81a862ac7b18c2fe4f6180a9b.zip
chromium_src-3c8cd81992440ed81a862ac7b18c2fe4f6180a9b.tar.gz
chromium_src-3c8cd81992440ed81a862ac7b18c2fe4f6180a9b.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 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=137040 Review URL: https://chromiumcodereview.appspot.com/10378043 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137153 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(