OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 1325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1336 // Inline autocomplete shouldn't be triggered. | 1336 // Inline autocomplete shouldn't be triggered. |
1337 ASSERT_EQ(ASCIIToUTF16("abc"), omnibox_view->GetText()); | 1337 ASSERT_EQ(ASCIIToUTF16("abc"), omnibox_view->GetText()); |
1338 } | 1338 } |
1339 #endif | 1339 #endif |
1340 | 1340 |
1341 // TODO(beng): enable on windows once it actually works. | 1341 // TODO(beng): enable on windows once it actually works. |
1342 #if defined(TOOLKIT_VIEWS) && !defined(OS_WIN) | 1342 #if defined(TOOLKIT_VIEWS) && !defined(OS_WIN) |
1343 class OmniboxViewViewsTest : public OmniboxViewTest { | 1343 class OmniboxViewViewsTest : public OmniboxViewTest { |
1344 public: | 1344 public: |
1345 OmniboxViewViewsTest() { | 1345 OmniboxViewViewsTest() { |
1346 views::Widget::IsPureViews(); | 1346 views::Widget::SetPureViews(true); |
1347 } | 1347 } |
1348 }; | 1348 }; |
1349 | 1349 |
1350 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, | 1350 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, |
1351 FLAKY_BrowserAccelerators) { | 1351 FLAKY_BrowserAccelerators) { |
1352 BrowserAcceleratorsTest(); | 1352 BrowserAcceleratorsTest(); |
1353 } | 1353 } |
1354 | 1354 |
1355 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, MAYBE_PopupAccelerators) { | 1355 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, MAYBE_PopupAccelerators) { |
1356 PopupAcceleratorsTest(); | 1356 PopupAcceleratorsTest(); |
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1408 PersistKeywordModeOnTabSwitch) { | 1408 PersistKeywordModeOnTabSwitch) { |
1409 PersistKeywordModeOnTabSwitch(); | 1409 PersistKeywordModeOnTabSwitch(); |
1410 } | 1410 } |
1411 | 1411 |
1412 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, | 1412 IN_PROC_BROWSER_TEST_F(OmniboxViewViewsTest, |
1413 CtrlKeyPressedWithInlineAutocompleteTest) { | 1413 CtrlKeyPressedWithInlineAutocompleteTest) { |
1414 CtrlKeyPressedWithInlineAutocompleteTest(); | 1414 CtrlKeyPressedWithInlineAutocompleteTest(); |
1415 } | 1415 } |
1416 | 1416 |
1417 #endif | 1417 #endif |
OLD | NEW |