Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/views/toolbar/browser_actions_container.h" | 5 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h" |
| 6 | 6 |
| 7 #include "chrome/browser/chrome_notification_types.h" | 7 #include "chrome/browser/chrome_notification_types.h" |
| 8 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" | 8 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h" |
| 9 #include "chrome/browser/extensions/browser_action_test_util.h" | 9 #include "chrome/browser/extensions/browser_action_test_util.h" |
| 10 #include "chrome/browser/extensions/extension_browsertest.h" | 10 #include "chrome/browser/extensions/extension_browsertest.h" |
|
James Cook
2014/02/07 00:53:02
nit: include extension_prefs.h
Ken Rockot(use gerrit already)
2014/02/10 18:53:02
Done.
| |
| 11 #include "chrome/browser/extensions/extension_service.h" | |
| 12 #include "content/public/test/test_utils.h" | 11 #include "content/public/test/test_utils.h" |
| 13 | 12 |
| 14 using extensions::Extension; | 13 using extensions::Extension; |
| 15 | 14 |
| 16 class BrowserActionsContainerTest : public ExtensionBrowserTest { | 15 class BrowserActionsContainerTest : public ExtensionBrowserTest { |
| 17 public: | 16 public: |
| 18 BrowserActionsContainerTest() { | 17 BrowserActionsContainerTest() { |
| 19 } | 18 } |
| 20 virtual ~BrowserActionsContainerTest() {} | 19 virtual ~BrowserActionsContainerTest() {} |
| 21 | 20 |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 174 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") | 173 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") |
| 175 .AppendASCII("browser_action") | 174 .AppendASCII("browser_action") |
| 176 .AppendASCII("basics"))); | 175 .AppendASCII("basics"))); |
| 177 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions()); | 176 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions()); |
| 178 EnsureExtensionHasIcon(0); | 177 EnsureExtensionHasIcon(0); |
| 179 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions()); | 178 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions()); |
| 180 std::string idA = browser_actions_bar()->GetExtensionId(0); | 179 std::string idA = browser_actions_bar()->GetExtensionId(0); |
| 181 | 180 |
| 182 // Force hide this browser action. | 181 // Force hide this browser action. |
| 183 extensions::ExtensionActionAPI::SetBrowserActionVisibility( | 182 extensions::ExtensionActionAPI::SetBrowserActionVisibility( |
| 184 extensions::ExtensionSystem::Get(browser()->profile())-> | 183 extensions::ExtensionPrefs::Get(browser()->profile()), |
| 185 extension_service()->extension_prefs(), | |
| 186 idA, | 184 idA, |
| 187 false); | 185 false); |
| 188 EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions()); | 186 EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions()); |
| 189 } | 187 } |
| OLD | NEW |