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" |
11 #include "chrome/browser/extensions/extension_action_test_util.h" | 11 #include "chrome/browser/extensions/extension_action_test_util.h" |
12 #include "chrome/browser/extensions/extension_browsertest.h" | 12 #include "chrome/browser/extensions/extension_browsertest.h" |
13 #include "chrome/browser/extensions/extension_service.h" | 13 #include "chrome/browser/extensions/extension_service.h" |
14 #include "chrome/browser/ui/extensions/extension_action_view_controller.h" | 14 #include "chrome/browser/ui/extensions/extension_action_view_controller.h" |
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 15 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
16 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" | 16 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" |
17 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" | 17 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
18 #include "chrome/browser/ui/views/frame/browser_view.h" | 18 #include "chrome/browser/ui/views/frame/browser_view.h" |
19 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" | 19 #include "chrome/browser/ui/views/tabs/tab_drag_controller_interactive_uitest.h" |
20 #include "chrome/browser/ui/views/toolbar/app_menu.h" | 20 #include "chrome/browser/ui/views/toolbar/app_menu.h" |
21 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" | 21 #include "chrome/browser/ui/views/toolbar/app_menu_button.h" |
22 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" | 22 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" |
23 #include "chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h" | 23 #include "chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h" |
24 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" | 24 #include "chrome/browser/ui/views/toolbar/toolbar_view.h" |
25 #include "chrome/test/base/interactive_test_utils.h" | 25 #include "chrome/test/base/interactive_test_utils.h" |
| 26 #include "extensions/browser/notification_types.h" |
26 #include "extensions/common/feature_switch.h" | 27 #include "extensions/common/feature_switch.h" |
27 #include "extensions/test/extension_test_message_listener.h" | 28 #include "extensions/test/extension_test_message_listener.h" |
28 #include "ui/views/controls/menu/menu_controller.h" | 29 #include "ui/views/controls/menu/menu_controller.h" |
29 #include "ui/views/controls/menu/menu_item_view.h" | 30 #include "ui/views/controls/menu/menu_item_view.h" |
30 #include "ui/views/controls/menu/submenu_view.h" | 31 #include "ui/views/controls/menu/submenu_view.h" |
31 | 32 |
32 namespace { | 33 namespace { |
33 | 34 |
34 AppMenuButton* GetAppButtonFromBrowser(Browser* browser) { | 35 AppMenuButton* GetAppButtonFromBrowser(Browser* browser) { |
35 return BrowserView::GetBrowserViewForBrowser(browser) | 36 return BrowserView::GetBrowserViewForBrowser(browser) |
(...skipping 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
379 // the message loop. Wait for this all to complete. | 380 // the message loop. Wait for this all to complete. |
380 EXPECT_TRUE(ui_test_utils::SendKeyPressToWindowSync( | 381 EXPECT_TRUE(ui_test_utils::SendKeyPressToWindowSync( |
381 native_window, ui::VKEY_RETURN, false, false, false, false)); | 382 native_window, ui::VKEY_RETURN, false, false, false, false)); |
382 base::RunLoop().RunUntilIdle(); | 383 base::RunLoop().RunUntilIdle(); |
383 | 384 |
384 // The menu should be closed. | 385 // The menu should be closed. |
385 EXPECT_FALSE(app_menu_button->IsMenuShowing()); | 386 EXPECT_FALSE(app_menu_button->IsMenuShowing()); |
386 // And the extension should have been activated. | 387 // And the extension should have been activated. |
387 EXPECT_TRUE(listener.WaitUntilSatisfied()); | 388 EXPECT_TRUE(listener.WaitUntilSatisfied()); |
388 } | 389 } |
OLD | NEW |