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 203 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 return render_view_host()->GetView()->HasFocus(); | 214 return render_view_host()->GetView()->HasFocus(); |
215 } | 215 } |
216 | 216 |
217 private: | 217 private: |
218 std::string html_contents_; | 218 std::string html_contents_; |
219 InterstitialPage* interstitial_page_; // Owns us. | 219 InterstitialPage* interstitial_page_; // Owns us. |
220 }; | 220 }; |
221 | 221 |
222 // Flaky on mac. http://crbug.com/67301. | 222 // Flaky on mac. http://crbug.com/67301. |
223 #if defined(OS_MACOSX) | 223 #if defined(OS_MACOSX) |
224 #define MAYBE_FindFocusTest DISABLED_FindFocusTest | 224 #define MAYBE_ClickingMovesFocus DISABLED_ClickingMovesFocus |
225 #else | 225 #else |
226 #define MAYBE_FindFocusTest FindFocusTest | 226 #define MAYBE_ClickingMovesFocus ClickingMovesFocus |
227 #endif | 227 #endif |
228 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_ClickingMovesFocus) { | 228 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, MAYBE_ClickingMovesFocus) { |
229 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); | 229 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); |
230 #if defined(OS_POSIX) | 230 #if defined(OS_POSIX) |
231 // It seems we have to wait a little bit for the widgets to spin up before | 231 // It seems we have to wait a little bit for the widgets to spin up before |
232 // we can start clicking on them. | 232 // we can start clicking on them. |
233 MessageLoop::current()->PostDelayedTask( | 233 MessageLoop::current()->PostDelayedTask( |
234 FROM_HERE, | 234 FROM_HERE, |
235 MessageLoop::QuitClosure(), | 235 MessageLoop::QuitClosure(), |
236 base::TimeDelta::FromMilliseconds(kActionDelayMs)); | 236 base::TimeDelta::FromMilliseconds(kActionDelayMs)); |
(...skipping 688 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
925 browser()->Reload(CURRENT_TAB); | 925 browser()->Reload(CURRENT_TAB); |
926 observer.Wait(); | 926 observer.Wait(); |
927 } | 927 } |
928 | 928 |
929 // Focus should now be on the tab contents. | 929 // Focus should now be on the tab contents. |
930 browser()->ShowDownloadsTab(); | 930 browser()->ShowDownloadsTab(); |
931 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); | 931 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); |
932 } | 932 } |
933 | 933 |
934 } // namespace | 934 } // namespace |
OLD | NEW |