chrome/browser/extensions/api/extension_action/browser_action_apitest.cc - Issue 10412052: Pull browser action click logic into ToolbarModelController, so that when I

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/browser_action_apitest.cc

Issue 10412052: Pull browser action click logic into ToolbarModelController, so that when I (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: views changes Created 8 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « no previous file | chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc » ('j') | chrome/browser/extensions/extension_toolbar_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 5f7070cfef3aa1882177cc5c5dd40ff7d676ef24..3eb8730b0b49fe2be46c1541ad4e6403ce6ae3ec 100644

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

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

@@ -77,8 +77,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, Basic) {

test_server()->GetURL("files/extensions/test_file.txt"));

ExtensionService* service = browser()->profile()->GetExtensionService();

- service->toolbar_model()->ExecuteBrowserAction(

- action->extension_id(), browser());

+ service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);

// Verify the command worked.

WebContents* tab = browser()->GetSelectedWebContents();

@@ -402,7 +401,7 @@ IN_PROC_BROWSER_TEST_F(BrowserActionApiTest, DISABLED_CloseBackgroundPage) {

// Click the browser action.

browser()->profile()->GetExtensionService()->toolbar_model()->

- ExecuteBrowserAction(action->extension_id(), browser());

+ ExecuteBrowserAction(extension, browser(), NULL);

// It can take a moment for the background page to actually get destroyed

// so we wait for the notification before checking that it's really gone