OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/extensions/browser_action_test_util.h" | 5 #include "chrome/browser/extensions/browser_action_test_util.h" |
6 #include "chrome/browser/extensions/extension_browsertest.h" | 6 #include "chrome/browser/extensions/extension_browsertest.h" |
7 #include "chrome/browser/views/browser_actions_container.h" | 7 #include "chrome/browser/views/browser_actions_container.h" |
8 #include "chrome/common/chrome_switches.h" | 8 #include "chrome/common/chrome_switches.h" |
9 | 9 |
10 class BrowserActionsContainerTest : public ExtensionBrowserTest { | 10 class BrowserActionsContainerTest : public ExtensionBrowserTest { |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 .AppendASCII("basics"))); | 54 .AppendASCII("basics"))); |
55 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions()); | 55 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions()); |
56 EnsureExtensionHasIcon(0); | 56 EnsureExtensionHasIcon(0); |
57 | 57 |
58 // Unload the extension. | 58 // Unload the extension. |
59 std::string id = browser_actions_bar()->GetExtensionId(0); | 59 std::string id = browser_actions_bar()->GetExtensionId(0); |
60 UnloadExtension(id); | 60 UnloadExtension(id); |
61 EXPECT_EQ(0, browser_actions_bar()->NumberOfBrowserActions()); | 61 EXPECT_EQ(0, browser_actions_bar()->NumberOfBrowserActions()); |
62 } | 62 } |
63 | 63 |
| 64 #if defined(OS_CHROMEOS) |
| 65 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, DISABLED_Visibility) { |
| 66 #else |
64 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, Visibility) { | 67 IN_PROC_BROWSER_TEST_F(BrowserActionsContainerTest, Visibility) { |
| 68 #endif |
65 BrowserActionsContainer::disable_animations_during_testing_ = true; | 69 BrowserActionsContainer::disable_animations_during_testing_ = true; |
66 | 70 |
67 // Load extension A (contains browser action). | 71 // Load extension A (contains browser action). |
68 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") | 72 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") |
69 .AppendASCII("browser_action") | 73 .AppendASCII("browser_action") |
70 .AppendASCII("basics"))); | 74 .AppendASCII("basics"))); |
71 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions()); | 75 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions()); |
72 EnsureExtensionHasIcon(0); | 76 EnsureExtensionHasIcon(0); |
73 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions()); | 77 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions()); |
74 std::string idA = browser_actions_bar()->GetExtensionId(0); | 78 std::string idA = browser_actions_bar()->GetExtensionId(0); |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
144 EXPECT_EQ(2, browser_actions_bar()->NumberOfBrowserActions()); | 148 EXPECT_EQ(2, browser_actions_bar()->NumberOfBrowserActions()); |
145 EXPECT_EQ(2, browser_actions_bar()->VisibleBrowserActions()); | 149 EXPECT_EQ(2, browser_actions_bar()->VisibleBrowserActions()); |
146 EXPECT_STREQ(idB.c_str(), browser_actions_bar()->GetExtensionId(0).c_str()); | 150 EXPECT_STREQ(idB.c_str(), browser_actions_bar()->GetExtensionId(0).c_str()); |
147 | 151 |
148 // Enable A (makes A, B and C showing now). State becomes: B, C, A. | 152 // Enable A (makes A, B and C showing now). State becomes: B, C, A. |
149 EnableExtension(idA); | 153 EnableExtension(idA); |
150 EXPECT_EQ(3, browser_actions_bar()->NumberOfBrowserActions()); | 154 EXPECT_EQ(3, browser_actions_bar()->NumberOfBrowserActions()); |
151 EXPECT_EQ(3, browser_actions_bar()->VisibleBrowserActions()); | 155 EXPECT_EQ(3, browser_actions_bar()->VisibleBrowserActions()); |
152 EXPECT_STREQ(idA.c_str(), browser_actions_bar()->GetExtensionId(2).c_str()); | 156 EXPECT_STREQ(idA.c_str(), browser_actions_bar()->GetExtensionId(2).c_str()); |
153 } | 157 } |
OLD | NEW |