| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "chrome/browser/ui/views/omnibox/omnibox_view_views.h" | 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/macros.h" | 10 #include "base/macros.h" |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 313 match.destination_url = GURL("http://autocomplete-result/"); | 313 match.destination_url = GURL("http://autocomplete-result/"); |
| 314 match.allowed_to_be_default_match = true; | 314 match.allowed_to_be_default_match = true; |
| 315 match.type = AutocompleteMatchType::HISTORY_TITLE; | 315 match.type = AutocompleteMatchType::HISTORY_TITLE; |
| 316 match.relevance = 500; | 316 match.relevance = 500; |
| 317 matches.push_back(match); | 317 matches.push_back(match); |
| 318 match.destination_url = GURL("http://autocomplete-result2/"); | 318 match.destination_url = GURL("http://autocomplete-result2/"); |
| 319 matches.push_back(match); | 319 matches.push_back(match); |
| 320 results.AppendMatches(AutocompleteInput(), matches); | 320 results.AppendMatches(AutocompleteInput(), matches); |
| 321 results.SortAndCull( | 321 results.SortAndCull( |
| 322 AutocompleteInput(), | 322 AutocompleteInput(), |
| 323 std::string(), | |
| 324 TemplateURLServiceFactory::GetForProfile(browser()->profile())); | 323 TemplateURLServiceFactory::GetForProfile(browser()->profile())); |
| 325 | 324 |
| 326 // The omnibox popup should open with suggestions displayed. | 325 // The omnibox popup should open with suggestions displayed. |
| 327 omnibox_view->model()->popup_model()->OnResultChanged(); | 326 omnibox_view->model()->popup_model()->OnResultChanged(); |
| 328 EXPECT_TRUE(omnibox_view->model()->popup_model()->IsOpen()); | 327 EXPECT_TRUE(omnibox_view->model()->popup_model()->IsOpen()); |
| 329 | 328 |
| 330 // The omnibox text should be selected. | 329 // The omnibox text should be selected. |
| 331 EXPECT_TRUE(omnibox_view->IsSelectAll()); | 330 EXPECT_TRUE(omnibox_view->IsSelectAll()); |
| 332 | 331 |
| 333 // Simulate a mouse click before dragging the mouse. | 332 // Simulate a mouse click before dragging the mouse. |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, FocusedTextInputClient) { | 381 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, FocusedTextInputClient) { |
| 383 chrome::FocusLocationBar(browser()); | 382 chrome::FocusLocationBar(browser()); |
| 384 OmniboxView* view = NULL; | 383 OmniboxView* view = NULL; |
| 385 ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &view)); | 384 ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &view)); |
| 386 OmniboxViewViews* omnibox_view_views = static_cast<OmniboxViewViews*>(view); | 385 OmniboxViewViews* omnibox_view_views = static_cast<OmniboxViewViews*>(view); |
| 387 ui::InputMethod* input_method = | 386 ui::InputMethod* input_method = |
| 388 omnibox_view_views->GetWidget()->GetInputMethod(); | 387 omnibox_view_views->GetWidget()->GetInputMethod(); |
| 389 EXPECT_EQ(static_cast<ui::TextInputClient*>(omnibox_view_views), | 388 EXPECT_EQ(static_cast<ui::TextInputClient*>(omnibox_view_views), |
| 390 input_method->GetTextInputClient()); | 389 input_method->GetTextInputClient()); |
| 391 } | 390 } |
| OLD | NEW |