Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/format_macros.h" | 7 #include "base/format_macros.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 412 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 423 const GURL url = embedded_test_server()->GetURL(kTypicalPage); | 423 const GURL url = embedded_test_server()->GetURL(kTypicalPage); |
| 424 ui_test_utils::NavigateToURL(browser(), url); | 424 ui_test_utils::NavigateToURL(browser(), url); |
| 425 EXPECT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); | 425 EXPECT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); |
| 426 chrome::FocusLocationBar(browser()); | 426 chrome::FocusLocationBar(browser()); |
| 427 | 427 |
| 428 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); | 428 WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents(); |
| 429 EXPECT_NO_FATAL_FAILURE(TestFocusTraversal(tab->GetRenderViewHost(), false)); | 429 EXPECT_NO_FATAL_FAILURE(TestFocusTraversal(tab->GetRenderViewHost(), false)); |
| 430 EXPECT_NO_FATAL_FAILURE(TestFocusTraversal(tab->GetRenderViewHost(), true)); | 430 EXPECT_NO_FATAL_FAILURE(TestFocusTraversal(tab->GetRenderViewHost(), true)); |
| 431 } | 431 } |
| 432 | 432 |
| 433 #if defined(OS_MACOSX) | |
| 434 // TODO(msw): Mac's details wrongly claim that the "textEdit" is not editable on | |
| 435 // the 2nd forwards traveral loop (but is correct in the 1st loop). Mac also | |
| 436 // doesn't advance focus on the 2nd reverse Tab press (gmapLink->gmailLink), but | |
| 437 // the 1st and 3rd+ Tab key presses seem to work. http://crbug.com/60973 | |
|
battre
2014/06/02 14:34:04
Any reason for adding a new bug number instead of
Michael van Ouwerkerk
2014/06/02 14:42:46
Ok I kept the old bug reference.
| |
| 438 #define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial | |
| 439 #else | |
| 440 #define MAYBE_FocusTraversalOnInterstitial FocusTraversalOnInterstitial | |
| 441 #endif | |
| 442 | |
| 443 // Test forward and reverse focus traversal while an interstitial is showing. | 433 // Test forward and reverse focus traversal while an interstitial is showing. |
| 444 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_FocusTraversalOnInterstitial) { | 434 // Disabled, see http://crbug.com/379762 |
| 435 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_FocusTraversalOnInterstitial) { | |
| 445 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); | 436 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); |
| 446 const GURL url = embedded_test_server()->GetURL(kSimplePage); | 437 const GURL url = embedded_test_server()->GetURL(kSimplePage); |
| 447 ui_test_utils::NavigateToURL(browser(), url); | 438 ui_test_utils::NavigateToURL(browser(), url); |
| 448 EXPECT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); | 439 EXPECT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); |
| 449 | 440 |
| 450 // Create and show a test interstitial page. | 441 // Create and show a test interstitial page. |
| 451 TestInterstitialPage* interstitial_page = new TestInterstitialPage( | 442 TestInterstitialPage* interstitial_page = new TestInterstitialPage( |
| 452 browser()->tab_strip_model()->GetActiveWebContents()); | 443 browser()->tab_strip_model()->GetActiveWebContents()); |
| 453 content::RenderViewHost* host = interstitial_page->render_view_host(); | 444 content::RenderViewHost* host = interstitial_page->render_view_host(); |
| 454 | 445 |
| (...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 699 content::NOTIFICATION_NAV_ENTRY_COMMITTED, | 690 content::NOTIFICATION_NAV_ENTRY_COMMITTED, |
| 700 content::NotificationService::AllSources()); | 691 content::NotificationService::AllSources()); |
| 701 chrome::GoForward(browser(), CURRENT_TAB); | 692 chrome::GoForward(browser(), CURRENT_TAB); |
| 702 forward_nav_observer.Wait(); | 693 forward_nav_observer.Wait(); |
| 703 } | 694 } |
| 704 | 695 |
| 705 EXPECT_FALSE(IsViewFocused(VIEW_ID_OMNIBOX)); | 696 EXPECT_FALSE(IsViewFocused(VIEW_ID_OMNIBOX)); |
| 706 } | 697 } |
| 707 | 698 |
| 708 } // namespace | 699 } // namespace |
| OLD | NEW |