| 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 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 47 #endif | 47 #endif |
| 48 | 48 |
| 49 #if defined(OS_WIN) | 49 #if defined(OS_WIN) |
| 50 #include <Psapi.h> | 50 #include <Psapi.h> |
| 51 #include <windows.h> | 51 #include <windows.h> |
| 52 #include "base/string_util.h" | 52 #include "base/string_util.h" |
| 53 #endif | 53 #endif |
| 54 | 54 |
| 55 using content::InterstitialPage; | 55 using content::InterstitialPage; |
| 56 using content::NavigationController; | 56 using content::NavigationController; |
| 57 using content::RenderViewHost; |
| 57 using content::WebContents; | 58 using content::WebContents; |
| 58 | 59 |
| 59 #if defined(OS_MACOSX) | 60 #if defined(OS_MACOSX) |
| 60 // TODO(suzhe): http://crbug.com/60973 | 61 // TODO(suzhe): http://crbug.com/60973 |
| 61 #define MAYBE_FocusTraversal DISABLED_FocusTraversal | 62 #define MAYBE_FocusTraversal DISABLED_FocusTraversal |
| 62 #define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial | 63 #define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial |
| 63 #elif defined(OS_WIN) | 64 #elif defined(OS_WIN) |
| 64 // http://crbug.com/109770 | 65 // http://crbug.com/109770 |
| 65 #define MAYBE_FocusTraversal FocusTraversal | 66 #define MAYBE_FocusTraversal FocusTraversal |
| 66 #define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial | 67 #define MAYBE_FocusTraversalOnInterstitial DISABLED_FocusTraversalOnInterstitial |
| (...skipping 852 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 919 browser()->Reload(CURRENT_TAB); | 920 browser()->Reload(CURRENT_TAB); |
| 920 observer.Wait(); | 921 observer.Wait(); |
| 921 } | 922 } |
| 922 | 923 |
| 923 // Focus should now be on the tab contents. | 924 // Focus should now be on the tab contents. |
| 924 browser()->ShowDownloadsTab(); | 925 browser()->ShowDownloadsTab(); |
| 925 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); | 926 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); |
| 926 } | 927 } |
| 927 | 928 |
| 928 } // namespace | 929 } // namespace |
| OLD | NEW |