| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
| 7 #include "base/format_macros.h" | 7 #include "base/format_macros.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/strings/string_number_conversions.h" | 10 #include "base/strings/string_number_conversions.h" |
| (...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 332 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); | 332 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); |
| 333 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); | 333 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
| 334 | 334 |
| 335 // First we navigate to our test page. | 335 // First we navigate to our test page. |
| 336 GURL url = embedded_test_server()->GetURL(kSimplePage); | 336 GURL url = embedded_test_server()->GetURL(kSimplePage); |
| 337 ui_test_utils::NavigateToURL(browser(), url); | 337 ui_test_utils::NavigateToURL(browser(), url); |
| 338 | 338 |
| 339 chrome::Find(browser()); | 339 chrome::Find(browser()); |
| 340 ui_test_utils::FindInPage( | 340 ui_test_utils::FindInPage( |
| 341 browser()->tab_strip_model()->GetActiveWebContents(), | 341 browser()->tab_strip_model()->GetActiveWebContents(), |
| 342 ASCIIToUTF16("a"), true, false, NULL, NULL); | 342 base::ASCIIToUTF16("a"), true, false, NULL, NULL); |
| 343 ASSERT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); | 343 ASSERT_TRUE(IsViewFocused(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD)); |
| 344 | 344 |
| 345 // Focus the location bar. | 345 // Focus the location bar. |
| 346 chrome::FocusLocationBar(browser()); | 346 chrome::FocusLocationBar(browser()); |
| 347 | 347 |
| 348 // Create a 2nd tab. | 348 // Create a 2nd tab. |
| 349 chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); | 349 chrome::AddSelectedTabWithURL(browser(), url, content::PAGE_TRANSITION_TYPED); |
| 350 | 350 |
| 351 // Focus should be on the recently opened tab page. | 351 // Focus should be on the recently opened tab page. |
| 352 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); | 352 ASSERT_TRUE(IsViewFocused(VIEW_ID_TAB_CONTAINER)); |
| (...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 980 content::NOTIFICATION_NAV_ENTRY_COMMITTED, | 980 content::NOTIFICATION_NAV_ENTRY_COMMITTED, |
| 981 content::NotificationService::AllSources()); | 981 content::NotificationService::AllSources()); |
| 982 chrome::GoForward(browser(), CURRENT_TAB); | 982 chrome::GoForward(browser(), CURRENT_TAB); |
| 983 forward_nav_observer.Wait(); | 983 forward_nav_observer.Wait(); |
| 984 } | 984 } |
| 985 | 985 |
| 986 EXPECT_FALSE(IsViewFocused(VIEW_ID_OMNIBOX)); | 986 EXPECT_FALSE(IsViewFocused(VIEW_ID_OMNIBOX)); |
| 987 } | 987 } |
| 988 | 988 |
| 989 } // namespace | 989 } // namespace |
| OLD | NEW |