| 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 <stdio.h> | 5 #include <stdio.h> |
| 6 | 6 |
| 7 #include "base/message_loop.h" | 7 #include "base/message_loop.h" |
| 8 #include "base/string16.h" | 8 #include "base/string16.h" |
| 9 #include "base/string_util.h" | 9 #include "base/string_util.h" |
| 10 #include "base/time.h" | 10 #include "base/time.h" |
| (...skipping 565 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 576 | 576 |
| 577 // Test ctrl-Enter. | 577 // Test ctrl-Enter. |
| 578 ASSERT_NO_FATAL_FAILURE(SendKeySequence(kDesiredTLDKeys)); | 578 ASSERT_NO_FATAL_FAILURE(SendKeySequence(kDesiredTLDKeys)); |
| 579 ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); | 579 ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); |
| 580 ASSERT_TRUE(popup_model->IsOpen()); | 580 ASSERT_TRUE(popup_model->IsOpen()); |
| 581 // ctrl-Enter triggers desired_tld feature, thus www.bar.com shall be | 581 // ctrl-Enter triggers desired_tld feature, thus www.bar.com shall be |
| 582 // opened. | 582 // opened. |
| 583 ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, ui::EF_CONTROL_DOWN, | 583 ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, ui::EF_CONTROL_DOWN, |
| 584 content::NOTIFICATION_NAV_ENTRY_COMMITTED, | 584 content::NOTIFICATION_NAV_ENTRY_COMMITTED, |
| 585 content::Source<content::NavigationController>( | 585 content::Source<content::NavigationController>( |
| 586 &browser()->GetSelectedWebContents()->GetController()))); | 586 &browser()->GetActiveWebContents()->GetController()))); |
| 587 | 587 |
| 588 GURL url = browser()->GetSelectedWebContents()->GetURL(); | 588 GURL url = browser()->GetActiveWebContents()->GetURL(); |
| 589 EXPECT_STREQ(kDesiredTLDHostname, url.host().c_str()); | 589 EXPECT_STREQ(kDesiredTLDHostname, url.host().c_str()); |
| 590 } | 590 } |
| 591 | 591 |
| 592 void AltEnterTest() { | 592 void AltEnterTest() { |
| 593 OmniboxView* omnibox_view = NULL; | 593 OmniboxView* omnibox_view = NULL; |
| 594 ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); | 594 ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); |
| 595 | 595 |
| 596 omnibox_view->SetUserText(ASCIIToUTF16(chrome::kChromeUIHistoryURL)); | 596 omnibox_view->SetUserText(ASCIIToUTF16(chrome::kChromeUIHistoryURL)); |
| 597 int tab_count = browser()->tab_count(); | 597 int tab_count = browser()->tab_count(); |
| 598 // alt-Enter opens a new tab. | 598 // alt-Enter opens a new tab. |
| (...skipping 13 matching lines...) Expand all Loading... |
| 612 ASSERT_TRUE(popup_model->IsOpen()); | 612 ASSERT_TRUE(popup_model->IsOpen()); |
| 613 | 613 |
| 614 // Check if the default match result is Search Primary Provider. | 614 // Check if the default match result is Search Primary Provider. |
| 615 ASSERT_EQ(AutocompleteMatch::SEARCH_WHAT_YOU_TYPED, | 615 ASSERT_EQ(AutocompleteMatch::SEARCH_WHAT_YOU_TYPED, |
| 616 popup_model->result().default_match()->type); | 616 popup_model->result().default_match()->type); |
| 617 | 617 |
| 618 // Open the default match. | 618 // Open the default match. |
| 619 ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, 0, | 619 ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, 0, |
| 620 content::NOTIFICATION_NAV_ENTRY_COMMITTED, | 620 content::NOTIFICATION_NAV_ENTRY_COMMITTED, |
| 621 content::Source<content::NavigationController>( | 621 content::Source<content::NavigationController>( |
| 622 &browser()->GetSelectedWebContents()->GetController()))); | 622 &browser()->GetActiveWebContents()->GetController()))); |
| 623 GURL url = browser()->GetSelectedWebContents()->GetURL(); | 623 GURL url = browser()->GetActiveWebContents()->GetURL(); |
| 624 EXPECT_STREQ(kSearchTextURL, url.spec().c_str()); | 624 EXPECT_STREQ(kSearchTextURL, url.spec().c_str()); |
| 625 | 625 |
| 626 // Test that entering a single character then Enter performs a search. | 626 // Test that entering a single character then Enter performs a search. |
| 627 browser()->FocusLocationBar(); | 627 browser()->FocusLocationBar(); |
| 628 EXPECT_TRUE(omnibox_view->IsSelectAll()); | 628 EXPECT_TRUE(omnibox_view->IsSelectAll()); |
| 629 ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchSingleCharKeys)); | 629 ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchSingleCharKeys)); |
| 630 ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); | 630 ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone()); |
| 631 ASSERT_TRUE(popup_model->IsOpen()); | 631 ASSERT_TRUE(popup_model->IsOpen()); |
| 632 EXPECT_EQ(kSearchSingleChar, UTF16ToUTF8(omnibox_view->GetText())); | 632 EXPECT_EQ(kSearchSingleChar, UTF16ToUTF8(omnibox_view->GetText())); |
| 633 | 633 |
| 634 // Check if the default match result is Search Primary Provider. | 634 // Check if the default match result is Search Primary Provider. |
| 635 ASSERT_EQ(AutocompleteMatch::SEARCH_WHAT_YOU_TYPED, | 635 ASSERT_EQ(AutocompleteMatch::SEARCH_WHAT_YOU_TYPED, |
| 636 popup_model->result().default_match()->type); | 636 popup_model->result().default_match()->type); |
| 637 | 637 |
| 638 // Open the default match. | 638 // Open the default match. |
| 639 ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, 0, | 639 ASSERT_TRUE(SendKeyAndWait(browser(), ui::VKEY_RETURN, 0, |
| 640 content::NOTIFICATION_NAV_ENTRY_COMMITTED, | 640 content::NOTIFICATION_NAV_ENTRY_COMMITTED, |
| 641 content::Source<content::NavigationController>( | 641 content::Source<content::NavigationController>( |
| 642 &browser()->GetSelectedWebContents()->GetController()))); | 642 &browser()->GetActiveWebContents()->GetController()))); |
| 643 url = browser()->GetSelectedWebContents()->GetURL(); | 643 url = browser()->GetActiveWebContents()->GetURL(); |
| 644 EXPECT_STREQ(kSearchSingleCharURL, url.spec().c_str()); | 644 EXPECT_STREQ(kSearchSingleCharURL, url.spec().c_str()); |
| 645 } | 645 } |
| 646 | 646 |
| 647 void EscapeToDefaultMatchTest() { | 647 void EscapeToDefaultMatchTest() { |
| 648 OmniboxView* omnibox_view = NULL; | 648 OmniboxView* omnibox_view = NULL; |
| 649 ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); | 649 ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view)); |
| 650 AutocompletePopupModel* popup_model = omnibox_view->model()->popup_model(); | 650 AutocompletePopupModel* popup_model = omnibox_view->model()->popup_model(); |
| 651 ASSERT_TRUE(popup_model); | 651 ASSERT_TRUE(popup_model); |
| 652 | 652 |
| 653 // Input something to trigger inline autocomplete. | 653 // Input something to trigger inline autocomplete. |
| (...skipping 922 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1576 | 1576 |
| 1577 // Middle-clicking shouldn't select all the text either. | 1577 // Middle-clicking shouldn't select all the text either. |
| 1578 ASSERT_NO_FATAL_FAILURE( | 1578 ASSERT_NO_FATAL_FAILURE( |
| 1579 ClickFocusViewOrigin(ui_controls::LEFT, kClickOffset, kClickOffset)); | 1579 ClickFocusViewOrigin(ui_controls::LEFT, kClickOffset, kClickOffset)); |
| 1580 ASSERT_NO_FATAL_FAILURE(ClickBrowserWindowCenter()); | 1580 ASSERT_NO_FATAL_FAILURE(ClickBrowserWindowCenter()); |
| 1581 ASSERT_NO_FATAL_FAILURE( | 1581 ASSERT_NO_FATAL_FAILURE( |
| 1582 ClickFocusViewOrigin(ui_controls::MIDDLE, kClickOffset, kClickOffset)); | 1582 ClickFocusViewOrigin(ui_controls::MIDDLE, kClickOffset, kClickOffset)); |
| 1583 EXPECT_FALSE(omnibox_view->IsSelectAll()); | 1583 EXPECT_FALSE(omnibox_view->IsSelectAll()); |
| 1584 } | 1584 } |
| 1585 #endif // defined(USE_AURA) | 1585 #endif // defined(USE_AURA) |
| OLD | NEW |