chrome/browser/extensions/error_console/error_console_browsertest.cc - Issue 496863003: Consolidate ExtensionAction execution code

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 496863003: Consolidate ExtensionAction execution code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/extensions/api/extension_action/page_action_apitest.cc ('k') | chrome/browser/extensions/extension_toolbar_model.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 a4a479b9c1994cceaff418a3cb70ad8c8640d411..9eb3c4c6b2e713c93e4f4ebf63d1170032b654d9 100644

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

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

@@ -9,8 +9,8 @@

#include "base/strings/string16.h"

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

+#include "chrome/browser/extensions/api/extension_action/extension_action_api.h"

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

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

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

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

@@ -249,8 +249,8 @@ class ErrorConsoleBrowserTest : public ExtensionBrowserTest {

break;

}

case ACTION_BROWSER_ACTION: {

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

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

+ ExtensionActionAPI::Get(profile())->ExecuteExtensionAction(

+ *extension, browser(), true);

break;

}

case ACTION_NEW_TAB: {