| 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 14 matching lines...) Expand all Loading... |
| 25 #include "content/browser/renderer_host/render_widget_host_view.h" | 25 #include "content/browser/renderer_host/render_widget_host_view.h" |
| 26 #include "content/browser/tab_contents/interstitial_page.h" | 26 #include "content/browser/tab_contents/interstitial_page.h" |
| 27 #include "content/browser/tab_contents/tab_contents.h" | 27 #include "content/browser/tab_contents/tab_contents.h" |
| 28 #include "content/browser/tab_contents/tab_contents_view.h" | 28 #include "content/browser/tab_contents/tab_contents_view.h" |
| 29 #include "content/common/view_messages.h" | 29 #include "content/common/view_messages.h" |
| 30 #include "content/public/browser/notification_service.h" | 30 #include "content/public/browser/notification_service.h" |
| 31 #include "net/test/test_server.h" | 31 #include "net/test/test_server.h" |
| 32 | 32 |
| 33 #if defined(TOOLKIT_VIEWS) || defined(OS_WIN) | 33 #if defined(TOOLKIT_VIEWS) || defined(OS_WIN) |
| 34 #include "ui/views/focus/focus_manager.h" | 34 #include "ui/views/focus/focus_manager.h" |
| 35 #include "views/view.h" | 35 #include "ui/views/view.h" |
| 36 #endif | 36 #endif |
| 37 | 37 |
| 38 #if defined(TOOLKIT_VIEWS) | 38 #if defined(TOOLKIT_VIEWS) |
| 39 #include "chrome/browser/ui/views/frame/browser_view.h" | 39 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 40 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" | 40 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" |
| 41 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" | 41 #include "chrome/browser/ui/views/tab_contents/tab_contents_container.h" |
| 42 #endif | 42 #endif |
| 43 | 43 |
| 44 #if defined(TOOLKIT_USES_GTK) | 44 #if defined(TOOLKIT_USES_GTK) |
| 45 #include "chrome/browser/ui/gtk/view_id_util.h" | 45 #include "chrome/browser/ui/gtk/view_id_util.h" |
| (...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 905 browser()->Reload(CURRENT_TAB); | 905 browser()->Reload(CURRENT_TAB); |
| 906 observer.Wait(); | 906 observer.Wait(); |
| 907 } | 907 } |
| 908 | 908 |
| 909 // Focus should now be on the tab contents. | 909 // Focus should now be on the tab contents. |
| 910 browser()->ShowDownloadsTab(); | 910 browser()->ShowDownloadsTab(); |
| 911 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); | 911 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); |
| 912 } | 912 } |
| 913 | 913 |
| 914 } // namespace | 914 } // namespace |
| OLD | NEW |