Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(44)

Side by Side Diff: chrome/browser/browser_focus_uitest.cc

Issue 2980007: TTF: Re-enable BrowserFocusTest.TabsRememberFocusFindInPage by marking it as (Closed)
Patch Set: Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "build/build_config.h" 5 #include "build/build_config.h"
6 6
7 #include "base/format_macros.h" 7 #include "base/format_macros.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/ref_counted.h" 9 #include "base/ref_counted.h"
10 #include "chrome/browser/automation/ui_controls.h" 10 #include "chrome/browser/automation/ui_controls.h"
(...skipping 20 matching lines...) Expand all
31 31
32 #if defined(TOOLKIT_USES_GTK) 32 #if defined(TOOLKIT_USES_GTK)
33 #include "chrome/browser/gtk/view_id_util.h" 33 #include "chrome/browser/gtk/view_id_util.h"
34 #endif 34 #endif
35 35
36 #if defined(OS_LINUX) 36 #if defined(OS_LINUX)
37 // For some reason we hit an external DNS lookup in this test in Linux but not 37 // For some reason we hit an external DNS lookup in this test in Linux but not
38 // on Windows. TODO(estade): investigate. 38 // on Windows. TODO(estade): investigate.
39 #define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial 39 #define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial
40 // TODO(jcampan): http://crbug.com/23683 40 // TODO(jcampan): http://crbug.com/23683
41 #define MAYBE_TabsRememberFocusFindInPage DISABLED_TabsRememberFocusFindInPage 41 #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage
42 #else 42 #else
43 #define MAYBE_FocusTraversalOnInterstitial FocusTraversalOnInterstitial 43 #define MAYBE_FocusTraversalOnInterstitial FocusTraversalOnInterstitial
44 #define MAYBE_TabsRememberFocusFindInPage TabsRememberFocusFindInPage 44 #define MAYBE_TabsRememberFocusFindInPage TabsRememberFocusFindInPage
45 #endif 45 #endif
46 46
47 namespace { 47 namespace {
48 48
49 // The delay waited in some cases where we don't have a notifications for an 49 // The delay waited in some cases where we don't have a notifications for an
50 // action we take. 50 // action we take.
51 const int kActionDelayMs = 500; 51 const int kActionDelayMs = 500;
(...skipping 709 matching lines...) Expand 10 before | Expand all | Expand 10 after
761 761
762 // Open a regular page, crash, reload. 762 // Open a regular page, crash, reload.
763 ui_test_utils::NavigateToURL(browser(), server->TestServerPage(kSimplePage)); 763 ui_test_utils::NavigateToURL(browser(), server->TestServerPage(kSimplePage));
764 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); 764 ui_test_utils::CrashTab(browser()->GetSelectedTabContents());
765 browser()->Reload(CURRENT_TAB); 765 browser()->Reload(CURRENT_TAB);
766 ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser())); 766 ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
767 // Focus should now be on the tab contents. 767 // Focus should now be on the tab contents.
768 browser()->ShowDownloadsTab(); 768 browser()->ShowDownloadsTab();
769 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); 769 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
770 } 770 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698