| 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 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 263 | 263 |
| 264 EXPECT_FALSE(action_view->IsMenuRunningForTesting()); | 264 EXPECT_FALSE(action_view->IsMenuRunningForTesting()); |
| 265 // We should have navigated to the extension's home page, which is google.com. | 265 // We should have navigated to the extension's home page, which is google.com. |
| 266 EXPECT_EQ( | 266 EXPECT_EQ( |
| 267 GURL("https://www.google.com/"), | 267 GURL("https://www.google.com/"), |
| 268 browser()->tab_strip_model()->GetActiveWebContents()->GetVisibleURL()); | 268 browser()->tab_strip_model()->GetActiveWebContents()->GetVisibleURL()); |
| 269 } | 269 } |
| 270 | 270 |
| 271 // Tests that clicking on the toolbar action a second time when the action is | 271 // Tests that clicking on the toolbar action a second time when the action is |
| 272 // already open results in closing the popup, and doesn't re-open it. | 272 // already open results in closing the popup, and doesn't re-open it. |
| 273 #if defined(OS_WIN) | 273 #if defined(OS_WIN) || defined(OS_LINUX) || (OS_CHROMEOS) |
| 274 // Flaky on Windows; see https://crbug.com/617056. | 274 // Flaky on Windows, Linux and ChromeOS; see https://crbug.com/617056. |
| 275 #define MAYBE_DoubleClickToolbarActionToClose \ | 275 #define MAYBE_DoubleClickToolbarActionToClose \ |
| 276 DISABLED_DoubleClickToolbarActionToClose | 276 DISABLED_DoubleClickToolbarActionToClose |
| 277 #else | 277 #else |
| 278 #define MAYBE_DoubleClickToolbarActionToClose DoubleClickToolbarActionToClose | 278 #define MAYBE_DoubleClickToolbarActionToClose DoubleClickToolbarActionToClose |
| 279 #endif | 279 #endif |
| 280 IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest, | 280 IN_PROC_BROWSER_TEST_F(ToolbarActionViewInteractiveUITest, |
| 281 MAYBE_DoubleClickToolbarActionToClose) { | 281 MAYBE_DoubleClickToolbarActionToClose) { |
| 282 ASSERT_TRUE(LoadExtension( | 282 ASSERT_TRUE(LoadExtension( |
| 283 test_data_dir_.AppendASCII("ui").AppendASCII("browser_action_popup"))); | 283 test_data_dir_.AppendASCII("ui").AppendASCII("browser_action_popup"))); |
| 284 base::RunLoop().RunUntilIdle(); // Ensure the extension is fully loaded. | 284 base::RunLoop().RunUntilIdle(); // Ensure the extension is fully loaded. |
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 // the message loop. Wait for this all to complete. | 380 // the message loop. Wait for this all to complete. |
| 381 EXPECT_TRUE(ui_test_utils::SendKeyPressToWindowSync( | 381 EXPECT_TRUE(ui_test_utils::SendKeyPressToWindowSync( |
| 382 native_window, ui::VKEY_RETURN, false, false, false, false)); | 382 native_window, ui::VKEY_RETURN, false, false, false, false)); |
| 383 base::RunLoop().RunUntilIdle(); | 383 base::RunLoop().RunUntilIdle(); |
| 384 | 384 |
| 385 // The menu should be closed. | 385 // The menu should be closed. |
| 386 EXPECT_FALSE(app_menu_button->IsMenuShowing()); | 386 EXPECT_FALSE(app_menu_button->IsMenuShowing()); |
| 387 // And the extension should have been activated. | 387 // And the extension should have been activated. |
| 388 EXPECT_TRUE(listener.WaitUntilSatisfied()); | 388 EXPECT_TRUE(listener.WaitUntilSatisfied()); |
| 389 } | 389 } |
| OLD | NEW |