chrome/browser/extensions/error_console/error_console_browsertest.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/error_console/error_console_browsertest.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/page_as_browser_action_apitest.cc ('k') | chrome/browser/extensions/extension_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/error_console/error_console_browsertest.cc

diff --git a/chrome/browser/extensions/error_console/error_console_browsertest.cc b/chrome/browser/extensions/error_console/error_console_browsertest.cc

index 952ff52263997b527d8eca51b04451efd2d836be..c866ce66d822e0a96b9edb815820002f776d4754 100644

--- a/chrome/browser/extensions/error_console/error_console_browsertest.cc

+++ b/chrome/browser/extensions/error_console/error_console_browsertest.cc

@@ -10,8 +10,6 @@

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

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

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

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

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

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

#include "chrome/common/extensions/extension.h"

@@ -244,9 +242,7 @@ class ErrorConsoleBrowserTest : public ExtensionBrowserTest {

break;

}

case ACTION_BROWSER_ACTION: {

- ExtensionService* service =

- extensions::ExtensionSystem::Get(profile())->extension_service();

- service->toolbar_model()->ExecuteBrowserAction(

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

*extension, browser(), NULL, true);

break;

}