| 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.h" |
| 9 #include "base/format_macros.h" | 9 #include "base/format_macros.h" |
| 10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 #define MAYBE_FocusTraversal FocusTraversal | 64 #define MAYBE_FocusTraversal FocusTraversal |
| 65 #define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial | 65 #define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial |
| 66 #else | 66 #else |
| 67 #define MAYBE_FocusTraversal FocusTraversal | 67 #define MAYBE_FocusTraversal FocusTraversal |
| 68 #define MAYBE_FocusTraversalOnInterstitial FocusTraversalOnInterstitial | 68 #define MAYBE_FocusTraversalOnInterstitial FocusTraversalOnInterstitial |
| 69 #endif | 69 #endif |
| 70 | 70 |
| 71 #if defined(OS_LINUX) || defined(OS_MACOSX) | 71 #if defined(OS_LINUX) || defined(OS_MACOSX) |
| 72 // TODO(jcampan): http://crbug.com/23683 for linux. | 72 // TODO(jcampan): http://crbug.com/23683 for linux. |
| 73 // TODO(suzhe): http://crbug.com/49737 for mac. | 73 // TODO(suzhe): http://crbug.com/49737 for mac. |
| 74 #define MAYBE_TabsRememberFocusFindInPage FAILS_TabsRememberFocusFindInPage | 74 #define MAYBE_TabsRememberFocusFindInPage DISABLED_TabsRememberFocusFindInPage |
| 75 #elif defined(OS_WIN) | 75 #elif defined(OS_WIN) |
| 76 // Flaky, http://crbug.com/62537. | 76 // Flaky, http://crbug.com/62537. |
| 77 #define MAYBE_TabsRememberFocusFindInPage DISABLED_TabsRememberFocusFindInPage | 77 #define MAYBE_TabsRememberFocusFindInPage DISABLED_TabsRememberFocusFindInPage |
| 78 #endif | 78 #endif |
| 79 | 79 |
| 80 namespace { | 80 namespace { |
| 81 | 81 |
| 82 // The delay waited in some cases where we don't have a notifications for an | 82 // The delay waited in some cases where we don't have a notifications for an |
| 83 // action we take. | 83 // action we take. |
| 84 const int kActionDelayMs = 500; | 84 const int kActionDelayMs = 500; |
| (...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 916 chrome::Reload(browser(), CURRENT_TAB); | 916 chrome::Reload(browser(), CURRENT_TAB); |
| 917 observer.Wait(); | 917 observer.Wait(); |
| 918 } | 918 } |
| 919 | 919 |
| 920 // Focus should now be on the tab contents. | 920 // Focus should now be on the tab contents. |
| 921 chrome::ShowDownloads(browser()); | 921 chrome::ShowDownloads(browser()); |
| 922 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); | 922 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); |
| 923 } | 923 } |
| 924 | 924 |
| 925 } // namespace | 925 } // namespace |
| OLD | NEW |