Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(513)

Side by Side Diff: chrome/browser/ui/views/browser_actions_container_browsertest.cc

Issue 14699002: Move BrowserAction references from ExtensionPrefs to ExtensionActionAPI (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/browser_actions_container.h" 5 #include "chrome/browser/ui/views/browser_actions_container.h"
6 6
7 #include "chrome/browser/extensions/api/extension_action/extension_action_api.h"
7 #include "chrome/browser/extensions/browser_action_test_util.h" 8 #include "chrome/browser/extensions/browser_action_test_util.h"
8 #include "chrome/browser/extensions/extension_browsertest.h" 9 #include "chrome/browser/extensions/extension_browsertest.h"
9 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
10 #include "content/public/test/test_utils.h" 11 #include "content/public/test/test_utils.h"
11 12
12 using extensions::Extension; 13 using extensions::Extension;
13 14
14 class BrowserActionsContainerTest : public ExtensionBrowserTest { 15 class BrowserActionsContainerTest : public ExtensionBrowserTest {
15 public: 16 public:
16 BrowserActionsContainerTest() { 17 BrowserActionsContainerTest() {
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
171 // Load extension A (contains browser action). 172 // Load extension A (contains browser action).
172 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test") 173 ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII("api_test")
173 .AppendASCII("browser_action") 174 .AppendASCII("browser_action")
174 .AppendASCII("basics"))); 175 .AppendASCII("basics")));
175 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions()); 176 EXPECT_EQ(1, browser_actions_bar()->NumberOfBrowserActions());
176 EnsureExtensionHasIcon(0); 177 EnsureExtensionHasIcon(0);
177 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions()); 178 EXPECT_EQ(1, browser_actions_bar()->VisibleBrowserActions());
178 std::string idA = browser_actions_bar()->GetExtensionId(0); 179 std::string idA = browser_actions_bar()->GetExtensionId(0);
179 180
180 // Force hide this browser action. 181 // Force hide this browser action.
181 ExtensionService* service = extensions::ExtensionSystem::Get( 182 extensions::ExtensionActionAPI::SetBrowserActionVisibility(
182 browser()->profile())->extension_service(); 183 extensions::ExtensionSystem::Get(browser()->profile())->
183 service->extension_prefs()->SetBrowserActionVisibility( 184 extension_service()->extension_prefs(),
184 service->GetExtensionById(idA, false), false); 185 idA,
186 false);
185 EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions()); 187 EXPECT_EQ(0, browser_actions_bar()->VisibleBrowserActions());
186 } 188 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698