| 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 #include "base/location.h" | 5 #include "base/location.h" |
| 6 #include "base/macros.h" | 6 #include "base/macros.h" |
| 7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
| 8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "base/strings/string_number_conversions.h" | 9 #include "base/strings/string_number_conversions.h" |
| 10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 204 TestOverflowedToolbarAction(browser(), ui_controls::LEFT); | 204 TestOverflowedToolbarAction(browser(), ui_controls::LEFT); |
| 205 | 205 |
| 206 base::RunLoop().RunUntilIdle(); | 206 base::RunLoop().RunUntilIdle(); |
| 207 // The app menu should no longer be showing. | 207 // The app menu should no longer be showing. |
| 208 EXPECT_FALSE(app_menu_button->IsMenuShowing()); | 208 EXPECT_FALSE(app_menu_button->IsMenuShowing()); |
| 209 | 209 |
| 210 // And the extension should have been activated. | 210 // And the extension should have been activated. |
| 211 listener.WaitUntilSatisfied(); | 211 listener.WaitUntilSatisfied(); |
| 212 } | 212 } |
| 213 | 213 |
| 214 #if defined(USE_OZONE) | 214 // TODO(jonross): determine cause of new flake, and restore previous MAYBE |
| 215 // ozone bringup - http://crbug.com/401304 | 215 // conditions. Temporarily disabling due to number of flakes (crbug.com/639010) |
| 216 #define MAYBE_TestContextMenuOnOverflowedAction \ | |
| 217 DISABLED_TestContextMenuOnOverflowedAction | |
| 218 #else | |
| 219 #define MAYBE_TestContextMenuOnOverflowedAction \ | |
| 220 TestContextMenuOnOverflowedAction | |
| 221 #endif | |
| 222 // Tests the context menus of overflowed extension actions. | 216 // Tests the context menus of overflowed extension actions. |
| 223 IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest, | 217 IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest, |
| 224 MAYBE_TestContextMenuOnOverflowedAction) { | 218 DISABLED_TestContextMenuOnOverflowedAction) { |
| 225 views::MenuController::TurnOffMenuSelectionHoldForTest(); | 219 views::MenuController::TurnOffMenuSelectionHoldForTest(); |
| 226 | 220 |
| 227 // Load an extension that has a home page (important for the context menu's | 221 // Load an extension that has a home page (important for the context menu's |
| 228 // first item being enabled). | 222 // first item being enabled). |
| 229 ASSERT_TRUE(LoadExtension( | 223 ASSERT_TRUE(LoadExtension( |
| 230 test_data_dir_.AppendASCII("ui").AppendASCII("browser_action_popup"))); | 224 test_data_dir_.AppendASCII("ui").AppendASCII("browser_action_popup"))); |
| 231 base::RunLoop().RunUntilIdle(); // Ensure the extension is fully loaded. | 225 base::RunLoop().RunUntilIdle(); // Ensure the extension is fully loaded. |
| 232 | 226 |
| 233 // Aaaannnnd... Load a bunch of other extensions so that the overflow menu | 227 // Aaaannnnd... Load a bunch of other extensions so that the overflow menu |
| 234 // is spread across multiple rows. | 228 // is spread across multiple rows. |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 388 ui_controls::SendKeyPressNotifyWhenDone(native_window, ui::VKEY_RETURN, false, | 382 ui_controls::SendKeyPressNotifyWhenDone(native_window, ui::VKEY_RETURN, false, |
| 389 false, false, false, | 383 false, false, false, |
| 390 loop.QuitClosure()); | 384 loop.QuitClosure()); |
| 391 loop.Run(); | 385 loop.Run(); |
| 392 | 386 |
| 393 // The menu should be closed. | 387 // The menu should be closed. |
| 394 EXPECT_FALSE(app_menu_button->IsMenuShowing()); | 388 EXPECT_FALSE(app_menu_button->IsMenuShowing()); |
| 395 // And the extension should have been activated. | 389 // And the extension should have been activated. |
| 396 EXPECT_TRUE(listener.WaitUntilSatisfied()); | 390 EXPECT_TRUE(listener.WaitUntilSatisfied()); |
| 397 } | 391 } |
| OLD | NEW |