chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc - Issue 48853005: Remove ExtensionToolbarModel from ExtensionService.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc

Issue 48853005: Remove ExtensionToolbarModel from ExtensionService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Compile after rebase Created 7 years, 1 month 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/extension_action/extension_action_api.cc ('k') | chrome/browser/extensions/error_console/error_console_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc

diff --git a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc

index 34eb519d7eb7f070f08207312bf390e36189528a..17bd878c23213caf94474909964be6049ea4b4e3 100644

--- a/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc

+++ b/chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc

@@ -13,6 +13,7 @@

#include "chrome/browser/extensions/extension_service.h"

#include "chrome/browser/extensions/extension_system.h"

#include "chrome/browser/extensions/extension_tab_util.h"

+#include "chrome/browser/extensions/extension_toolbar_model.h"

#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/browser/ui/browser_window.h"

@@ -89,9 +90,7 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, Basic) {

{

// Simulate the page action being clicked.

ResultCatcher catcher;

- ExtensionService* service = extensions::ExtensionSystem::Get(

- browser()->profile())->extension_service();

- service->toolbar_model()->ExecuteBrowserAction(

+ ExtensionToolbarModel::Get(browser()->profile())->ExecuteBrowserAction(

extension, browser(), NULL, true);

EXPECT_TRUE(catcher.GetNextResult());

}

@@ -134,9 +133,7 @@ IN_PROC_BROWSER_TEST_F(PageAsBrowserActionApiTest, AddPopup) {

// install a page action popup.

{