| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 43 #if defined(TOOLKIT_USES_GTK) | 43 #if defined(TOOLKIT_USES_GTK) |
| 44 #include "chrome/browser/ui/gtk/view_id_util.h" | 44 #include "chrome/browser/ui/gtk/view_id_util.h" |
| 45 #endif | 45 #endif |
| 46 | 46 |
| 47 #if defined(OS_WIN) | 47 #if defined(OS_WIN) |
| 48 #include <Psapi.h> | 48 #include <Psapi.h> |
| 49 #include <windows.h> | 49 #include <windows.h> |
| 50 #include "base/string_util.h" | 50 #include "base/string_util.h" |
| 51 #endif | 51 #endif |
| 52 | 52 |
| 53 #if defined(OS_LINUX) | 53 #if defined(OS_MACOSX) |
| 54 // TODO(suzhe): http://crbug.com/60973 |
| 55 #define MAYBE_FocusTraversal DISABLED_FocusTraversal |
| 56 #define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial |
| 57 #else |
| 54 #define MAYBE_FocusTraversal FocusTraversal | 58 #define MAYBE_FocusTraversal FocusTraversal |
| 55 #define MAYBE_FocusTraversalOnInterstitial FocusTraversalOnInterstitial | 59 #define MAYBE_FocusTraversalOnInterstitial FocusTraversalOnInterstitial |
| 56 // TODO(jcampan): http://crbug.com/23683 | 60 #endif |
| 57 #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage | 61 |
| 58 #elif defined(OS_MACOSX) | 62 #if defined(OS_LINUX) || defined(OS_MACOSX) |
| 59 // TODO(suzhe): http://crbug.com/60973 (following two tests) | 63 // TODO(jcampan): http://crbug.com/23683 for linux. |
| 60 #define MAYBE_FocusTraversal DISABLED_FocusTraversal | 64 // TODO(suzhe): http://crbug.com/49737 for mac. |
| 61 #define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial | |
| 62 // TODO(suzhe): http://crbug.com/49737 | |
| 63 #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage | 65 #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage |
| 64 #elif defined(OS_WIN) | 66 #elif defined(OS_WIN) |
| 65 // Disabled, http://crbug.com/62543. | |
| 66 #define MAYBE_FocusTraversal FocusTraversal | |
| 67 // Disabled, http://crbug.com/62544. | |
| 68 #define MAYBE_FocusTraversalOnInterstitial FocusTraversalOnInterstitial | |
| 69 // Flaky, http://crbug.com/62537. | 67 // Flaky, http://crbug.com/62537. |
| 70 #define MAYBE_TabsRememberFocusFindInPage FLAKY_TabsRememberFocusFindInPage | 68 #define MAYBE_TabsRememberFocusFindInPage FLAKY_TabsRememberFocusFindInPage |
| 71 #endif | 69 #endif |
| 72 | 70 |
| 73 namespace { | 71 namespace { |
| 74 | 72 |
| 75 // The delay waited in some cases where we don't have a notifications for an | 73 // The delay waited in some cases where we don't have a notifications for an |
| 76 // action we take. | 74 // action we take. |
| 77 const int kActionDelayMs = 500; | 75 const int kActionDelayMs = 500; |
| 78 | 76 |
| (...skipping 816 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 895 browser()->Reload(CURRENT_TAB); | 893 browser()->Reload(CURRENT_TAB); |
| 896 observer.Wait(); | 894 observer.Wait(); |
| 897 } | 895 } |
| 898 | 896 |
| 899 // Focus should now be on the tab contents. | 897 // Focus should now be on the tab contents. |
| 900 browser()->ShowDownloadsTab(); | 898 browser()->ShowDownloadsTab(); |
| 901 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); | 899 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); |
| 902 } | 900 } |
| 903 | 901 |
| 904 } // namespace | 902 } // namespace |
| OLD | NEW |