OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h" | 5 #include "chrome/browser/ui/toolbar/browser_actions_bar_browsertest.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/macros.h" | 9 #include "base/macros.h" |
| 10 #include "base/prefs/pref_service.h" |
10 #include "base/run_loop.h" | 11 #include "base/run_loop.h" |
11 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" | 12 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" |
12 #include "chrome/browser/extensions/browser_action_test_util.h" | 13 #include "chrome/browser/extensions/browser_action_test_util.h" |
13 #include "chrome/browser/extensions/extension_action.h" | 14 #include "chrome/browser/extensions/extension_action.h" |
14 #include "chrome/browser/extensions/extension_action_manager.h" | 15 #include "chrome/browser/extensions/extension_action_manager.h" |
15 #include "chrome/browser/extensions/extension_action_test_util.h" | 16 #include "chrome/browser/extensions/extension_action_test_util.h" |
16 #include "chrome/browser/extensions/extension_browsertest.h" | 17 #include "chrome/browser/extensions/extension_browsertest.h" |
17 #include "chrome/browser/extensions/extension_service.h" | 18 #include "chrome/browser/extensions/extension_service.h" |
18 #include "chrome/browser/sessions/session_tab_helper.h" | 19 #include "chrome/browser/sessions/session_tab_helper.h" |
19 #include "chrome/browser/ui/extensions/extension_action_view_controller.h" | 20 #include "chrome/browser/ui/extensions/extension_action_view_controller.h" |
20 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 21 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
21 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" | 22 #include "chrome/browser/ui/toolbar/toolbar_action_view_controller.h" |
22 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" | 23 #include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" |
23 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" | 24 #include "chrome/browser/ui/toolbar/toolbar_actions_model.h" |
| 25 #include "chrome/common/pref_names.h" |
24 #include "components/crx_file/id_util.h" | 26 #include "components/crx_file/id_util.h" |
25 #include "content/public/browser/notification_service.h" | 27 #include "content/public/browser/notification_service.h" |
26 #include "content/public/test/test_utils.h" | 28 #include "content/public/test/test_utils.h" |
27 #include "extensions/browser/extension_prefs.h" | 29 #include "extensions/browser/extension_prefs.h" |
28 #include "extensions/browser/extension_registry.h" | 30 #include "extensions/browser/extension_registry.h" |
29 #include "extensions/browser/notification_types.h" | 31 #include "extensions/browser/notification_types.h" |
30 #include "extensions/common/extension.h" | 32 #include "extensions/common/extension.h" |
31 #include "extensions/common/extension_builder.h" | 33 #include "extensions/common/extension_builder.h" |
32 #include "extensions/common/value_builder.h" | 34 #include "extensions/common/value_builder.h" |
33 #include "extensions/test/extension_test_message_listener.h" | 35 #include "extensions/test/extension_test_message_listener.h" |
(...skipping 465 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
499 EXPECT_EQ(page_action_extension->id(), | 501 EXPECT_EQ(page_action_extension->id(), |
500 browser_actions_bar()->GetExtensionId(0)); | 502 browser_actions_bar()->GetExtensionId(0)); |
501 browser_actions_bar()->Press(0); | 503 browser_actions_bar()->Press(0); |
502 base::RunLoop().RunUntilIdle(); | 504 base::RunLoop().RunUntilIdle(); |
503 EXPECT_TRUE(browser_actions_bar()->HasPopup()); | 505 EXPECT_TRUE(browser_actions_bar()->HasPopup()); |
504 // Cleanup the popup (to avoid having windows open at tear down). | 506 // Cleanup the popup (to avoid having windows open at tear down). |
505 browser_actions_bar()->HidePopup(); | 507 browser_actions_bar()->HidePopup(); |
506 content::RunAllBlockingPoolTasksUntilIdle(); | 508 content::RunAllBlockingPoolTasksUntilIdle(); |
507 EXPECT_FALSE(browser_actions_bar()->HasPopup()); | 509 EXPECT_FALSE(browser_actions_bar()->HasPopup()); |
508 } | 510 } |
| 511 |
| 512 // Tests that the browser actions container correctly highlights for displaying |
| 513 // the icon surfacing bubble. |
| 514 IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest, |
| 515 PRE_HighlightsForExtensionIconSurfacingBubble) { |
| 516 // Add a new extension and clear the pref for the bubble being acknowledged. |
| 517 base::FilePath path = PackExtension(test_data_dir_.AppendASCII("api_test") |
| 518 .AppendASCII("page_action") |
| 519 .AppendASCII("simple")); |
| 520 InstallExtensionFromWebstore(path, 1); |
| 521 profile()->GetPrefs()->ClearPref( |
| 522 prefs::kToolbarIconSurfacingBubbleAcknowledged); |
| 523 } |
| 524 |
| 525 IN_PROC_BROWSER_TEST_F(BrowserActionsBarRedesignBrowserTest, |
| 526 HighlightsForExtensionIconSurfacingBubble) { |
| 527 // The toolbar should be highlighting for the bubble. |
| 528 EXPECT_TRUE(browser_actions_bar()->IsHighlightingForSurfacingBubble()); |
| 529 } |
OLD | NEW |