| OLD | NEW |
| 1 // Copyright (c) 2010 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" |
| 11 #include "base/string_number_conversions.h" | 11 #include "base/string_number_conversions.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 26 #include "chrome/test/ui_test_utils.h" | 26 #include "chrome/test/ui_test_utils.h" |
| 27 #include "net/test/test_server.h" | 27 #include "net/test/test_server.h" |
| 28 | 28 |
| 29 #if defined(TOOLKIT_VIEWS) || defined(OS_WIN) | 29 #if defined(TOOLKIT_VIEWS) || defined(OS_WIN) |
| 30 #include "views/focus/focus_manager.h" | 30 #include "views/focus/focus_manager.h" |
| 31 #include "views/view.h" | 31 #include "views/view.h" |
| 32 #include "views/window/window.h" | 32 #include "views/window/window.h" |
| 33 #endif | 33 #endif |
| 34 | 34 |
| 35 #if defined(TOOLKIT_VIEWS) | 35 #if defined(TOOLKIT_VIEWS) |
| 36 #include "chrome/browser/views/frame/browser_view.h" | 36 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 37 #include "chrome/browser/views/location_bar/location_bar_view.h" | 37 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 38 #include "chrome/browser/views/tab_contents/tab_contents_container.h" | 38 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" |
| 39 #endif | 39 #endif |
| 40 | 40 |
| 41 #if defined(TOOLKIT_USES_GTK) | 41 #if defined(TOOLKIT_USES_GTK) |
| 42 #include "chrome/browser/gtk/view_id_util.h" | 42 #include "chrome/browser/gtk/view_id_util.h" |
| 43 #endif | 43 #endif |
| 44 | 44 |
| 45 #if defined(OS_WIN) | 45 #if defined(OS_WIN) |
| 46 #include <windows.h> | 46 #include <windows.h> |
| 47 #include <Psapi.h> | 47 #include <Psapi.h> |
| 48 #endif | 48 #endif |
| (...skipping 785 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 834 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); | 834 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); |
| 835 browser()->Reload(CURRENT_TAB); | 835 browser()->Reload(CURRENT_TAB); |
| 836 ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser())); | 836 ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser())); |
| 837 | 837 |
| 838 // Focus should now be on the tab contents. | 838 // Focus should now be on the tab contents. |
| 839 browser()->ShowDownloadsTab(); | 839 browser()->ShowDownloadsTab(); |
| 840 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); | 840 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); |
| 841 } | 841 } |
| 842 | 842 |
| 843 } // namespace | 843 } // namespace |
| OLD | NEW |