OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" | 5 #import "chrome/browser/ui/cocoa/extensions/browser_action_button.h" |
6 | 6 |
7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> |
8 | 8 |
9 #include <memory> | 9 #include <memory> |
10 | 10 |
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
422 } | 422 } |
423 } | 423 } |
424 | 424 |
425 // Close the app menu. | 425 // Close the app menu. |
426 [appMenuController cancel]; | 426 [appMenuController cancel]; |
427 EXPECT_FALSE([appMenuController isMenuOpen]) << error_message; | 427 EXPECT_FALSE([appMenuController isMenuOpen]) << error_message; |
428 base::MessageLoop::current()->PostTask(FROM_HERE, closure); | 428 base::MessageLoop::current()->PostTask(FROM_HERE, closure); |
429 } | 429 } |
430 | 430 |
431 // Tests the layout of the overflow container in the app menu. | 431 // Tests the layout of the overflow container in the app menu. |
432 IN_PROC_BROWSER_TEST_F(BrowserActionButtonUiTest, TestOverflowContainerLayout) { | 432 // Disabled due to crashing flakily, see crbug.com/602203. |
| 433 IN_PROC_BROWSER_TEST_F(BrowserActionButtonUiTest, |
| 434 DISABLED_TestOverflowContainerLayout) { |
433 // Add a bunch of extensions - enough to trigger multiple rows in the overflow | 435 // Add a bunch of extensions - enough to trigger multiple rows in the overflow |
434 // menu. | 436 // menu. |
435 const int kNumExtensions = 12; | 437 const int kNumExtensions = 12; |
436 for (int i = 0; i < kNumExtensions; ++i) { | 438 for (int i = 0; i < kNumExtensions; ++i) { |
437 scoped_refptr<const extensions::Extension> extension = | 439 scoped_refptr<const extensions::Extension> extension = |
438 extensions::extension_action_test_util::CreateActionExtension( | 440 extensions::extension_action_test_util::CreateActionExtension( |
439 base::StringPrintf("extension%d", i), | 441 base::StringPrintf("extension%d", i), |
440 extensions::extension_action_test_util::BROWSER_ACTION); | 442 extensions::extension_action_test_util::BROWSER_ACTION); |
441 extension_service()->AddExtension(extension.get()); | 443 extension_service()->AddExtension(extension.get()); |
442 } | 444 } |
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
583 { | 585 { |
584 EXPECT_FALSE([menuHelper menuOpened]); | 586 EXPECT_FALSE([menuHelper menuOpened]); |
585 base::RunLoop runLoop; | 587 base::RunLoop runLoop; |
586 ui_controls::SendKeyPressNotifyWhenDone([actionButton window], | 588 ui_controls::SendKeyPressNotifyWhenDone([actionButton window], |
587 ui::VKEY_SPACE, false, false, false, | 589 ui::VKEY_SPACE, false, false, false, |
588 false, runLoop.QuitClosure()); | 590 false, runLoop.QuitClosure()); |
589 runLoop.Run(); | 591 runLoop.Run(); |
590 EXPECT_TRUE([menuHelper menuOpened]); | 592 EXPECT_TRUE([menuHelper menuOpened]); |
591 } | 593 } |
592 } | 594 } |
OLD | NEW |