Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(34)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

Issue 10810062: Moving common code into OmniboxView from OmniboxView* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More win fixes Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/ui/omnibox/omnibox_view.cc ('K') | « chrome/browser/ui/omnibox/omnibox_view.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 8783a293faf471d28d654b73fcfc38b74370d846..4b72b176bdfa75142956da06cda92f74ca2a888d 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -244,7 +244,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
AutocompleteController* controller =
- omnibox_view->model()->autocomplete_controller();
+ omnibox_view->GetModel()->autocomplete_controller();
ASSERT_TRUE(controller);
if (controller->done())
@@ -499,23 +499,23 @@ class OmniboxViewTest : public InProcessBrowserTest,
// Trigger keyword hint mode.
ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
// Trigger keyword mode.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
// Backspace without search text should bring back keyword hint mode.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
// Trigger keyword mode again.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
// Input something as search text.
ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
@@ -524,8 +524,9 @@ class OmniboxViewTest : public InProcessBrowserTest,
// backspace.
for (size_t i = 0; i < arraysize(kSearchText) - 1; ++i) {
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(kSearchKeyword,
+ UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
}
// Input something as search text.
@@ -541,8 +542,8 @@ class OmniboxViewTest : public InProcessBrowserTest,
// Backspace at the beginning of the search text shall turn off
// the keyword mode.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(string16(), omnibox_view->model()->keyword());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(string16(), omnibox_view->GetModel()->keyword());
ASSERT_EQ(std::string(kSearchKeyword) + kSearchText,
UTF16ToUTF8(omnibox_view->GetText()));
}
@@ -571,7 +572,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
void DesiredTLDTest() {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
- OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+ OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
ASSERT_TRUE(popup_model);
// Test ctrl-Enter.
@@ -603,7 +604,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
void EnterToSearchTest() {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
- OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+ OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
ASSERT_TRUE(popup_model);
// Test Enter to search.
@@ -647,7 +648,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
void EscapeToDefaultMatchTest() {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
- OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+ OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
ASSERT_TRUE(popup_model);
// Input something to trigger inline autocomplete.
@@ -751,20 +752,20 @@ class OmniboxViewTest : public InProcessBrowserTest,
// Trigger keyword hint mode.
ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
ASSERT_EQ(search_keyword, omnibox_view->GetText());
// Trigger keyword mode by space.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
ASSERT_TRUE(omnibox_view->GetText().empty());
// Revert to keyword hint mode.
- omnibox_view->model()->ClearKeyword(string16());
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+ omnibox_view->GetModel()->ClearKeyword(string16());
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
ASSERT_EQ(search_keyword, omnibox_view->GetText());
// Keyword should also be accepted by typing an ideographic space.
@@ -772,14 +773,14 @@ class OmniboxViewTest : public InProcessBrowserTest,
omnibox_view->SetWindowTextAndCaretPos(search_keyword +
WideToUTF16(L"\x3000"), search_keyword.length() + 1, false, false);
omnibox_view->OnAfterPossibleChange();
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
ASSERT_TRUE(omnibox_view->GetText().empty());
// Revert to keyword hint mode.
- omnibox_view->model()->ClearKeyword(string16());
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+ omnibox_view->GetModel()->ClearKeyword(string16());
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
ASSERT_EQ(search_keyword, omnibox_view->GetText());
// Keyword shouldn't be accepted by pressing space with a trailing
@@ -787,21 +788,21 @@ class OmniboxViewTest : public InProcessBrowserTest,
omnibox_view->SetWindowTextAndCaretPos(search_keyword + char16(' '),
search_keyword.length() + 1, false, false);
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
ASSERT_EQ(search_keyword + ASCIIToUTF16(" "), omnibox_view->GetText());
// Keyword shouldn't be accepted by deleting the trailing space.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
ASSERT_EQ(search_keyword + char16(' '), omnibox_view->GetText());
// Keyword shouldn't be accepted by pressing space before a trailing space.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
ASSERT_EQ(search_keyword + ASCIIToUTF16(" "), omnibox_view->GetText());
// Keyword should be accepted by pressing space in the middle of context and
@@ -810,30 +811,30 @@ class OmniboxViewTest : public InProcessBrowserTest,
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_A, 0));
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
ASSERT_EQ(ASCIIToUTF16("a "), omnibox_view->GetText());
// Keyword shouldn't be accepted by pasting "foo bar".
omnibox_view->SetUserText(string16());
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_TRUE(omnibox_view->model()->keyword().empty());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_TRUE(omnibox_view->GetModel()->keyword().empty());
omnibox_view->OnBeforePossibleChange();
- omnibox_view->model()->on_paste();
+ omnibox_view->GetModel()->on_paste();
omnibox_view->SetWindowTextAndCaretPos(search_keyword +
ASCIIToUTF16(" bar"), search_keyword.length() + 4, false, false);
omnibox_view->OnAfterPossibleChange();
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_TRUE(omnibox_view->model()->keyword().empty());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_TRUE(omnibox_view->GetModel()->keyword().empty());
ASSERT_EQ(search_keyword + ASCIIToUTF16(" bar"), omnibox_view->GetText());
// Keyword shouldn't be accepted for case like: "foo b|ar" -> "foo b |ar".
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_TRUE(omnibox_view->model()->keyword().empty());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_TRUE(omnibox_view->GetModel()->keyword().empty());
ASSERT_EQ(search_keyword + ASCIIToUTF16(" b ar"), omnibox_view->GetText());
// Keyword could be accepted by pressing space with a selected range at the
@@ -842,16 +843,16 @@ class OmniboxViewTest : public InProcessBrowserTest,
omnibox_view->OnInlineAutocompleteTextMaybeChanged(
search_keyword + ASCIIToUTF16(" "), search_keyword.length());
omnibox_view->OnAfterPossibleChange();
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
ASSERT_EQ(search_keyword + ASCIIToUTF16(" "), omnibox_view->GetText());
size_t start, end;
omnibox_view->GetSelectionBounds(&start, &end);
ASSERT_NE(start, end);
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
ASSERT_EQ(string16(), omnibox_view->GetText());
// Space should accept keyword even when inline autocomplete is available.
@@ -867,17 +868,17 @@ class OmniboxViewTest : public InProcessBrowserTest,
// Type "foo" to trigger inline autocomplete.
ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
- ASSERT_TRUE(omnibox_view->model()->popup_model()->IsOpen());
+ ASSERT_TRUE(omnibox_view->GetModel()->popup_model()->IsOpen());
ASSERT_NE(search_keyword, omnibox_view->GetText());
// Keyword hint shouldn't be visible.
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_TRUE(omnibox_view->model()->keyword().empty());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_TRUE(omnibox_view->GetModel()->keyword().empty());
// Trigger keyword mode by space.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
ASSERT_TRUE(omnibox_view->GetText().empty());
// Space in the middle of a temporary text, which separates the text into
@@ -885,11 +886,11 @@ class OmniboxViewTest : public InProcessBrowserTest,
omnibox_view->SetUserText(string16());
ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
- OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+ OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
ASSERT_TRUE(popup_model->IsOpen());
ASSERT_EQ(ASCIIToUTF16("foobar.com"), omnibox_view->GetText());
- omnibox_view->model()->OnUpOrDownKeyPressed(1);
- omnibox_view->model()->OnUpOrDownKeyPressed(-1);
+ omnibox_view->GetModel()->OnUpOrDownKeyPressed(1);
+ omnibox_view->GetModel()->OnUpOrDownKeyPressed(-1);
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
@@ -898,8 +899,8 @@ class OmniboxViewTest : public InProcessBrowserTest,
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0));
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword, omnibox_view->model()->keyword());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword, omnibox_view->GetModel()->keyword());
ASSERT_EQ(ASCIIToUTF16("bar.com"), omnibox_view->GetText());
// Space after temporary text that looks like a keyword, when the original
@@ -924,18 +925,18 @@ class OmniboxViewTest : public InProcessBrowserTest,
string16 search_keyword2(ASCIIToUTF16(kSearchKeyword2));
while ((omnibox_view->GetText() != search_keyword2) &&
(popup_model->selected_line() < popup_model->result().size() - 1))
- omnibox_view->model()->OnUpOrDownKeyPressed(1);
+ omnibox_view->GetModel()->OnUpOrDownKeyPressed(1);
ASSERT_EQ(search_keyword2, omnibox_view->GetText());
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(search_keyword2, omnibox_view->model()->keyword());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(search_keyword2, omnibox_view->GetModel()->keyword());
ASSERT_TRUE(omnibox_view->GetText().empty());
}
void NonSubstitutingKeywordTest() {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
- OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+ OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
ASSERT_TRUE(popup_model);
Profile* profile = browser()->profile();
@@ -996,7 +997,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
- OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+ OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
ASSERT_TRUE(popup_model);
string16 old_text = omnibox_view->GetText();
@@ -1023,7 +1024,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
popup_model->result().match_at(default_line).destination_url.spec();
// Move down.
- omnibox_view->model()->OnUpOrDownKeyPressed(1);
+ omnibox_view->GetModel()->OnUpOrDownKeyPressed(1);
ASSERT_EQ(default_line + 1, popup_model->selected_line());
string16 selected_text =
popup_model->result().match_at(default_line + 1).fill_into_edit;
@@ -1046,15 +1047,15 @@ class OmniboxViewTest : public InProcessBrowserTest,
ASSERT_EQ(selected_text, omnibox_view->GetText());
// Revert to the default match.
- ASSERT_TRUE(omnibox_view->model()->OnEscapeKeyPressed());
+ ASSERT_TRUE(omnibox_view->GetModel()->OnEscapeKeyPressed());
ASSERT_EQ(default_line, popup_model->selected_line());
ASSERT_EQ(user_text, omnibox_view->GetText());
ASSERT_TRUE(omnibox_view->IsSelectAll());
// Move down and up to select the default match as temporary text.
- omnibox_view->model()->OnUpOrDownKeyPressed(1);
+ omnibox_view->GetModel()->OnUpOrDownKeyPressed(1);
ASSERT_EQ(default_line + 1, popup_model->selected_line());
- omnibox_view->model()->OnUpOrDownKeyPressed(-1);
+ omnibox_view->GetModel()->OnUpOrDownKeyPressed(-1);
ASSERT_EQ(default_line, popup_model->selected_line());
selected_text = popup_model->result().match_at(default_line).fill_into_edit;
@@ -1081,7 +1082,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
// As the current selected item is the new default item, pressing Escape key
// should revert all directly.
- ASSERT_TRUE(omnibox_view->model()->OnEscapeKeyPressed());
+ ASSERT_TRUE(omnibox_view->GetModel()->OnEscapeKeyPressed());
ASSERT_EQ(old_text, omnibox_view->GetText());
ASSERT_TRUE(omnibox_view->IsSelectAll());
}
@@ -1094,20 +1095,20 @@ class OmniboxViewTest : public InProcessBrowserTest,
// Trigger keyword hint mode.
ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(text, omnibox_view->model()->keyword());
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
ASSERT_EQ(text, omnibox_view->GetText());
// Trigger keyword mode by tab.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(text, omnibox_view->model()->keyword());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
ASSERT_TRUE(omnibox_view->GetText().empty());
// Revert to keyword hint mode.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0));
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(text, omnibox_view->model()->keyword());
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
ASSERT_EQ(text, omnibox_view->GetText());
// The location bar should still have focus.
@@ -1116,8 +1117,8 @@ class OmniboxViewTest : public InProcessBrowserTest,
// Trigger keyword mode by tab.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(text, omnibox_view->model()->keyword());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
ASSERT_TRUE(omnibox_view->GetText().empty());
// Revert to keyword hint mode with SHIFT+TAB.
@@ -1126,8 +1127,8 @@ class OmniboxViewTest : public InProcessBrowserTest,
#else
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, ui::EF_SHIFT_DOWN));
#endif
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(text, omnibox_view->model()->keyword());
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
ASSERT_EQ(text, omnibox_view->GetText());
ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
@@ -1137,7 +1138,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
void TabTraverseResultsTest() {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
- OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+ OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
ASSERT_TRUE(popup_model);
// Input something to trigger results.
@@ -1191,8 +1192,8 @@ class OmniboxViewTest : public InProcessBrowserTest,
// Trigger keyword mode by tab.
string16 text = ASCIIToUTF16(kSearchKeyword);
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(text, omnibox_view->model()->keyword());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
ASSERT_TRUE(omnibox_view->GetText().empty());
// The location bar should still have focus.
@@ -1202,9 +1203,9 @@ class OmniboxViewTest : public InProcessBrowserTest,
// Pressing tab again should move to the next result and clear keyword
// mode.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
- ASSERT_EQ(1U, omnibox_view->model()->popup_model()->selected_line());
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_NE(text, omnibox_view->model()->keyword());
+ ASSERT_EQ(1U, omnibox_view->GetModel()->popup_model()->selected_line());
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_NE(text, omnibox_view->GetModel()->keyword());
// The location bar should still have focus.
ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
@@ -1212,8 +1213,8 @@ class OmniboxViewTest : public InProcessBrowserTest,
// Moving back up should not show keyword mode.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, ui::EF_SHIFT_DOWN));
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(text, omnibox_view->model()->keyword());
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(text, omnibox_view->GetModel()->keyword());
ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(),
location_bar_focus_view_id_));
@@ -1225,13 +1226,13 @@ class OmniboxViewTest : public InProcessBrowserTest,
// Trigger keyword hint mode.
ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchKeywordKeys));
- ASSERT_TRUE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+ ASSERT_TRUE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
// Trigger keyword mode.
ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_TAB, 0));
- ASSERT_FALSE(omnibox_view->model()->is_keyword_hint());
- ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+ ASSERT_FALSE(omnibox_view->GetModel()->is_keyword_hint());
+ ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
// Input something as search text.
ASSERT_NO_FATAL_FAILURE(SendKeySequence(kSearchTextKeys));
@@ -1243,13 +1244,13 @@ class OmniboxViewTest : public InProcessBrowserTest,
chrome::ActivateTabAt(browser(), 0, true);
// Make sure we're still in keyword mode.
- ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->model()->keyword()));
+ ASSERT_EQ(kSearchKeyword, UTF16ToUTF8(omnibox_view->GetModel()->keyword()));
}
void CtrlKeyPressedWithInlineAutocompleteTest() {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
- OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+ OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
ASSERT_TRUE(popup_model);
// Input something to trigger inline autocomplete.
@@ -1263,7 +1264,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
EXPECT_GT(old_text.length(), arraysize(kInlineAutocompleteText) - 1);
// Press ctrl key.
- omnibox_view->model()->OnControlKeyChanged(true);
+ omnibox_view->GetModel()->OnControlKeyChanged(true);
// Inline autocomplete should still be there.
EXPECT_EQ(old_text, omnibox_view->GetText());
@@ -1595,7 +1596,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, PrimarySelection) {
IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_PasteReplacingAll) {
OmniboxView* omnibox_view = NULL;
ASSERT_NO_FATAL_FAILURE(GetOmniboxView(&omnibox_view));
- OmniboxPopupModel* popup_model = omnibox_view->model()->popup_model();
+ OmniboxPopupModel* popup_model = omnibox_view->GetModel()->popup_model();
ASSERT_TRUE(popup_model);
SetClipboardText(kSearchText);
« chrome/browser/ui/omnibox/omnibox_view.cc ('K') | « chrome/browser/ui/omnibox/omnibox_view.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698