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 "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/browser/search_engines/template_url_service_factory.h" | 8 #include "chrome/browser/search_engines/template_url_service_factory.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/browser_commands.h" | 10 #include "chrome/browser/ui/browser_commands.h" |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
84 } else { | 84 } else { |
85 generator.GestureScrollSequence(press_location, | 85 generator.GestureScrollSequence(press_location, |
86 release_location, | 86 release_location, |
87 base::TimeDelta::FromMilliseconds(10), | 87 base::TimeDelta::FromMilliseconds(10), |
88 1); | 88 1); |
89 } | 89 } |
90 } | 90 } |
91 | 91 |
92 private: | 92 private: |
93 // InProcessBrowserTest: | 93 // InProcessBrowserTest: |
94 virtual void SetUpOnMainThread() OVERRIDE { | 94 virtual void SetUpOnMainThread() override { |
95 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); | 95 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); |
96 chrome::FocusLocationBar(browser()); | 96 chrome::FocusLocationBar(browser()); |
97 ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); | 97 ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); |
98 } | 98 } |
99 | 99 |
100 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViewsTest); | 100 DISALLOW_COPY_AND_ASSIGN(OmniboxViewViewsTest); |
101 }; | 101 }; |
102 | 102 |
103 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, PasteAndGoDoesNotLeavePopupOpen) { | 103 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, PasteAndGoDoesNotLeavePopupOpen) { |
104 OmniboxView* view = NULL; | 104 OmniboxView* view = NULL; |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 // TextInputFocusManager completes. | 332 // TextInputFocusManager completes. |
333 chrome::FocusLocationBar(browser()); | 333 chrome::FocusLocationBar(browser()); |
334 OmniboxView* view = NULL; | 334 OmniboxView* view = NULL; |
335 ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &view)); | 335 ASSERT_NO_FATAL_FAILURE(GetOmniboxViewForBrowser(browser(), &view)); |
336 OmniboxViewViews* omnibox_view_views = static_cast<OmniboxViewViews*>(view); | 336 OmniboxViewViews* omnibox_view_views = static_cast<OmniboxViewViews*>(view); |
337 ui::TextInputFocusManager* text_input_focus_manager = | 337 ui::TextInputFocusManager* text_input_focus_manager = |
338 ui::TextInputFocusManager::GetInstance(); | 338 ui::TextInputFocusManager::GetInstance(); |
339 EXPECT_EQ(omnibox_view_views->GetTextInputClient(), | 339 EXPECT_EQ(omnibox_view_views->GetTextInputClient(), |
340 text_input_focus_manager->GetFocusedTextInputClient()); | 340 text_input_focus_manager->GetFocusedTextInputClient()); |
341 } | 341 } |
OLD | NEW |