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

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

Issue 3492012: Reenable BrowserFocusTest.FocusTraversalOnInterstitial on Linux (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Created 10 years, 2 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/file_util.h" 7 #include "base/file_util.h"
8 #include "base/format_macros.h" 8 #include "base/format_macros.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 27 matching lines...) Expand all
38 #include "chrome/browser/views/location_bar/location_bar_view.h" 38 #include "chrome/browser/views/location_bar/location_bar_view.h"
39 #include "chrome/browser/views/tab_contents/tab_contents_container.h" 39 #include "chrome/browser/views/tab_contents/tab_contents_container.h"
40 #endif 40 #endif
41 41
42 #if defined(TOOLKIT_USES_GTK) 42 #if defined(TOOLKIT_USES_GTK)
43 #include "chrome/browser/gtk/view_id_util.h" 43 #include "chrome/browser/gtk/view_id_util.h"
44 #endif 44 #endif
45 45
46 #if defined(OS_LINUX) 46 #if defined(OS_LINUX)
47 #define MAYBE_FocusTraversal FocusTraversal 47 #define MAYBE_FocusTraversal FocusTraversal
48 // For some reason we hit an external DNS lookup in this test in Linux but not 48 #define MAYBE_FocusTraversalOnInterstitial FocusTraversalOnInterstitial
49 // on Windows. TODO(estade): investigate.
50 #define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial
51 // TODO(jcampan): http://crbug.com/23683 49 // TODO(jcampan): http://crbug.com/23683
52 #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage 50 #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage
53 #elif defined(OS_MACOSX) 51 #elif defined(OS_MACOSX)
54 // TODO(suzhe): http://crbug.com/49738 (following two tests) 52 // TODO(suzhe): http://crbug.com/49738 (following two tests)
55 #define MAYBE_FocusTraversal FAILS_FocusTraversal 53 #define MAYBE_FocusTraversal FAILS_FocusTraversal
56 #define MAYBE_FocusTraversalOnInterstitial FAILS_FocusTraversalOnInterstitial 54 #define MAYBE_FocusTraversalOnInterstitial FAILS_FocusTraversalOnInterstitial
57 // TODO(suzhe): http://crbug.com/49737 55 // TODO(suzhe): http://crbug.com/49737
58 #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage 56 #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage
59 #elif defined(OS_WIN) 57 #elif defined(OS_WIN)
60 #define MAYBE_FocusTraversal FocusTraversal 58 #define MAYBE_FocusTraversal FocusTraversal
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); 802 ui_test_utils::CrashTab(browser()->GetSelectedTabContents());
805 browser()->Reload(CURRENT_TAB); 803 browser()->Reload(CURRENT_TAB);
806 ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser())); 804 ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser()));
807 805
808 // Focus should now be on the tab contents. 806 // Focus should now be on the tab contents.
809 browser()->ShowDownloadsTab(); 807 browser()->ShowDownloadsTab();
810 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); 808 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW));
811 } 809 }
812 810
813 } // namespace 811 } // namespace
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