| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/format_macros.h" | 7 #include "base/format_macros.h" |
| 8 #include "base/logging.h" | 8 #include "base/logging.h" |
| 9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
| 10 #include "base/ref_counted.h" | 10 #include "base/ref_counted.h" |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 } | 153 } |
| 154 | 154 |
| 155 private: | 155 private: |
| 156 std::string html_contents_; | 156 std::string html_contents_; |
| 157 | 157 |
| 158 bool waiting_for_dom_response_; | 158 bool waiting_for_dom_response_; |
| 159 bool waiting_for_focus_change_; | 159 bool waiting_for_focus_change_; |
| 160 std::string dom_response_; | 160 std::string dom_response_; |
| 161 }; | 161 }; |
| 162 | 162 |
| 163 } // namespace | |
| 164 | |
| 165 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, ClickingMovesFocus) { | 163 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, ClickingMovesFocus) { |
| 166 BringBrowserWindowToFront(); | 164 BringBrowserWindowToFront(); |
| 167 #if defined(USE_X11) || defined(OS_MACOSX) | 165 #if defined(USE_X11) || defined(OS_MACOSX) |
| 168 // It seems we have to wait a little bit for the widgets to spin up before | 166 // It seems we have to wait a little bit for the widgets to spin up before |
| 169 // we can start clicking on them. | 167 // we can start clicking on them. |
| 170 MessageLoop::current()->PostDelayedTask(FROM_HERE, | 168 MessageLoop::current()->PostDelayedTask(FROM_HERE, |
| 171 new MessageLoop::QuitTask(), | 169 new MessageLoop::QuitTask(), |
| 172 kActionDelayMs); | 170 kActionDelayMs); |
| 173 ui_test_utils::RunMessageLoop(); | 171 ui_test_utils::RunMessageLoop(); |
| 174 #endif | 172 #endif |
| (...skipping 634 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 809 | 807 |
| 810 // Open a regular page, crash, reload. | 808 // Open a regular page, crash, reload. |
| 811 ui_test_utils::NavigateToURL(browser(), server->TestServerPage(kSimplePage)); | 809 ui_test_utils::NavigateToURL(browser(), server->TestServerPage(kSimplePage)); |
| 812 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); | 810 ui_test_utils::CrashTab(browser()->GetSelectedTabContents()); |
| 813 browser()->Reload(CURRENT_TAB); | 811 browser()->Reload(CURRENT_TAB); |
| 814 ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser())); | 812 ASSERT_TRUE(ui_test_utils::WaitForNavigationInCurrentTab(browser())); |
| 815 // Focus should now be on the tab contents. | 813 // Focus should now be on the tab contents. |
| 816 browser()->ShowDownloadsTab(); | 814 browser()->ShowDownloadsTab(); |
| 817 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); | 815 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER_FOCUS_VIEW)); |
| 818 } | 816 } |
| 817 |
| 818 } // namespace |
| OLD | NEW |