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/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/strings/string16.h" | 8 #include "base/strings/string16.h" |
9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" |
10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
132 const int kCtrlOrCmdMask = ui::EF_COMMAND_DOWN; | 132 const int kCtrlOrCmdMask = ui::EF_COMMAND_DOWN; |
133 #else | 133 #else |
134 const int kCtrlOrCmdMask = ui::EF_CONTROL_DOWN; | 134 const int kCtrlOrCmdMask = ui::EF_CONTROL_DOWN; |
135 #endif | 135 #endif |
136 | 136 |
137 } // namespace | 137 } // namespace |
138 | 138 |
139 class OmniboxViewTest : public InProcessBrowserTest, | 139 class OmniboxViewTest : public InProcessBrowserTest, |
140 public content::NotificationObserver { | 140 public content::NotificationObserver { |
141 protected: | 141 protected: |
142 virtual void SetUpOnMainThread() OVERRIDE { | 142 virtual void SetUpOnMainThread() override { |
143 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); | 143 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); |
144 ASSERT_NO_FATAL_FAILURE(SetupComponents()); | 144 ASSERT_NO_FATAL_FAILURE(SetupComponents()); |
145 chrome::FocusLocationBar(browser()); | 145 chrome::FocusLocationBar(browser()); |
146 ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); | 146 ASSERT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX)); |
147 } | 147 } |
148 | 148 |
149 static void GetOmniboxViewForBrowser( | 149 static void GetOmniboxViewForBrowser( |
150 const Browser* browser, | 150 const Browser* browser, |
151 OmniboxView** omnibox_view) { | 151 OmniboxView** omnibox_view) { |
152 BrowserWindow* window = browser->window(); | 152 BrowserWindow* window = browser->window(); |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 } | 334 } |
335 | 335 |
336 void SetupComponents() { | 336 void SetupComponents() { |
337 ASSERT_NO_FATAL_FAILURE(SetupHostResolver()); | 337 ASSERT_NO_FATAL_FAILURE(SetupHostResolver()); |
338 ASSERT_NO_FATAL_FAILURE(SetupSearchEngine()); | 338 ASSERT_NO_FATAL_FAILURE(SetupSearchEngine()); |
339 ASSERT_NO_FATAL_FAILURE(SetupHistory()); | 339 ASSERT_NO_FATAL_FAILURE(SetupHistory()); |
340 } | 340 } |
341 | 341 |
342 virtual void Observe(int type, | 342 virtual void Observe(int type, |
343 const content::NotificationSource& source, | 343 const content::NotificationSource& source, |
344 const content::NotificationDetails& details) OVERRIDE { | 344 const content::NotificationDetails& details) override { |
345 switch (type) { | 345 switch (type) { |
346 case content::NOTIFICATION_WEB_CONTENTS_DESTROYED: | 346 case content::NOTIFICATION_WEB_CONTENTS_DESTROYED: |
347 case chrome::NOTIFICATION_TAB_PARENTED: | 347 case chrome::NOTIFICATION_TAB_PARENTED: |
348 case chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY: | 348 case chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY: |
349 case chrome::NOTIFICATION_HISTORY_LOADED: | 349 case chrome::NOTIFICATION_HISTORY_LOADED: |
350 case chrome::NOTIFICATION_HISTORY_URLS_MODIFIED: | 350 case chrome::NOTIFICATION_HISTORY_URLS_MODIFIED: |
351 break; | 351 break; |
352 default: | 352 default: |
353 FAIL() << "Unexpected notification type"; | 353 FAIL() << "Unexpected notification type"; |
354 } | 354 } |
(...skipping 1444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1799 omnibox_view->Update(); | 1799 omnibox_view->Update(); |
1800 EXPECT_EQ(url_c, omnibox_view->GetText()); | 1800 EXPECT_EQ(url_c, omnibox_view->GetText()); |
1801 } | 1801 } |
1802 | 1802 |
1803 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, EscDisablesSearchTermReplacement) { | 1803 IN_PROC_BROWSER_TEST_F(OmniboxViewTest, EscDisablesSearchTermReplacement) { |
1804 browser()->toolbar_model()->set_url_replacement_enabled(true); | 1804 browser()->toolbar_model()->set_url_replacement_enabled(true); |
1805 chrome::FocusLocationBar(browser()); | 1805 chrome::FocusLocationBar(browser()); |
1806 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_ESCAPE, 0)); | 1806 ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_ESCAPE, 0)); |
1807 EXPECT_FALSE(browser()->toolbar_model()->url_replacement_enabled()); | 1807 EXPECT_FALSE(browser()->toolbar_model()->url_replacement_enabled()); |
1808 } | 1808 } |
OLD | NEW |